Setting breakpoints by name is even more specialized in LLDB as you can specify
that you want to set a breakpoint at a function by method name. To set a breakpoint
- on all C++ methods named foo you can entier either of:
foo you can enter either of:
(lldb) breakpoint set --method foo
(lldb) breakpoint set -M foo
- To set a breakpoint Objective C selectors named alignLeftEdges: you can entier either of:
To set a breakpoint Objective C selectors named alignLeftEdges: you can enter either of:
(lldb) breakpoint set --selector alignLeftEdges:
From gclayton at apple.com Thu Aug 4 16:02:57 2011
From: gclayton at apple.com (Greg Clayton)
Date: Thu, 04 Aug 2011 21:02:57 -0000
Subject: [Lldb-commits] [lldb] r136920 - in /lldb/trunk:
include/lldb/Symbol/ClangASTContext.h
source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
source/Symbol/ClangASTContext.cpp
Message-ID: <20110804210257.BB05A2A6C12C@llvm.org>
Author: gclayton
Date: Thu Aug 4 16:02:57 2011
New Revision: 136920
URL: http://llvm.org/viewvc/llvm-project?rev=136920&view=rev
Log:
Make sure we track CXX and objc method decls.
Modified:
lldb/trunk/include/lldb/Symbol/ClangASTContext.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/trunk/source/Symbol/ClangASTContext.cpp
Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=136920&r1=136919&r2=136920&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Thu Aug 4 16:02:57 2011
@@ -300,6 +300,13 @@
is_explicit);
}
+ static clang::DeclContext *
+ GetAsDeclContext (clang::CXXMethodDecl *cxx_method_decl);
+
+ static clang::DeclContext *
+ GetAsDeclContext (clang::ObjCMethodDecl *objc_method_decl);
+
+
static bool
CheckOverloadedOperatorKindParameterCount (uint32_t op_kind,
uint32_t num_params);
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=136920&r1=136919&r2=136920&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Thu Aug 4 16:02:57 2011
@@ -3645,6 +3645,7 @@
type_name_cstr,
clang_type,
accessibility);
+ LinkDeclContextToDIE(ClangASTContext::GetAsDeclContext(objc_method_decl), die);
type_handled = objc_method_decl != NULL;
}
}
@@ -3683,6 +3684,8 @@
is_static,
is_inline,
is_explicit);
+ LinkDeclContextToDIE(ClangASTContext::GetAsDeclContext(cxx_method_decl), die);
+
type_handled = cxx_method_decl != NULL;
}
}
Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=136920&r1=136919&r2=136920&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Thu Aug 4 16:02:57 2011
@@ -4912,3 +4912,15 @@
}
}
+clang::DeclContext *
+ClangASTContext::GetAsDeclContext (clang::CXXMethodDecl *cxx_method_decl)
+{
+ return clang::dyn_cast(cxx_method_decl);
+}
+
+clang::DeclContext *
+ClangASTContext::GetAsDeclContext (clang::ObjCMethodDecl *objc_method_decl)
+{
+ return clang::dyn_cast(objc_method_decl);
+}
+
From scallanan at apple.com Thu Aug 4 16:37:47 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 04 Aug 2011 21:37:47 -0000
Subject: [Lldb-commits] [lldb] r136928 - in /lldb/trunk:
include/lldb/Expression/IRForTarget.h
source/Expression/ASTResultSynthesizer.cpp
source/Expression/IRForTarget.cpp
Message-ID: <20110804213747.AA7D92A6C12C@llvm.org>
Author: spyffe
Date: Thu Aug 4 16:37:47 2011
New Revision: 136928
URL: http://llvm.org/viewvc/llvm-project?rev=136928&view=rev
Log:
Fixed a problem that caused LLDB to fail to execute
expressions that used function pointers. The problem
was that IRForTarget previously only scanned the IR
for the expression for call instructions; if a function
was used in another context, it was ignored.
Now LLDB scans the Module for functions that are only
declared (not also defined -- so these are externals);
it then constructs function pointers for these
functions and substitutes them wherever the function
is used.
Also made some changes so that "expr main" works just
as well as "expr &main"; they end up being the same
code, but LLDB was generating the result variable in
different ways.
Modified:
lldb/trunk/include/lldb/Expression/IRForTarget.h
lldb/trunk/source/Expression/ASTResultSynthesizer.cpp
lldb/trunk/source/Expression/IRForTarget.cpp
Modified: lldb/trunk/include/lldb/Expression/IRForTarget.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRForTarget.h?rev=136928&r1=136927&r2=136928&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRForTarget.h (original)
+++ lldb/trunk/include/lldb/Expression/IRForTarget.h Thu Aug 4 16:37:47 2011
@@ -149,11 +149,73 @@
FixFunctionLinkage (llvm::Function &llvm_function);
//------------------------------------------------------------------
+ /// A module-level pass to replace all function pointers with their
+ /// integer equivalents.
+ //------------------------------------------------------------------
+
+ //------------------------------------------------------------------
+ /// The top-level pass implementation
+ ///
+ /// @param[in] llvm_module
+ /// The module currently being processed.
+ ///
+ /// @param[in] llvm_function
+ /// The function currently being processed.
+ ///
+ /// @return
+ /// True on success; false otherwise.
+ //------------------------------------------------------------------
+ bool
+ HasSideEffects (llvm::Function &llvm_function);
+
+ //------------------------------------------------------------------
/// A function-level pass to check whether the function has side
/// effects.
//------------------------------------------------------------------
//------------------------------------------------------------------
+ /// Get the address of a fuction, and a location to put the complete
+ /// Value of the function if one is available.
+ ///
+ /// @param[in] function
+ /// The function to find the location of.
+ ///
+ /// @param[out] ptr
+ /// The location of the function in the target.
+ ///
+ /// @param[out] name
+ /// The resolved name of the function (matters for intrinsics).
+ ///
+ /// @param[out] value_ptr
+ /// A variable to put the function's completed Value* in, or NULL
+ /// if the Value* shouldn't be stored anywhere.
+ ///
+ /// @return
+ /// The pointer.
+ //------------------------------------------------------------------
+ bool
+ GetFunctionAddress (llvm::Function *function,
+ uint64_t &ptr,
+ lldb_private::ConstString &name,
+ llvm::Constant **&value_ptr);
+
+ //------------------------------------------------------------------
+ /// Build a function pointer given a type and a raw pointer.
+ ///
+ /// @param[in] type
+ /// The type of the function pointer to be built.
+ ///
+ /// @param[in] ptr
+ /// The value of the pointer.
+ ///
+ /// @return
+ /// The pointer.
+ //------------------------------------------------------------------
+ llvm::Constant *
+ BuildFunctionPointer (llvm::Type *type,
+ uint64_t ptr);
+
+ //------------------------------------------------------------------
/// The top-level pass implementation
///
/// @param[in] llvm_function
@@ -164,7 +226,8 @@
/// be determined); false otherwise.
//------------------------------------------------------------------
bool
- HasSideEffects (llvm::Function &llvm_function);
+ ResolveFunctionPointers (llvm::Module &llvm_module,
+ llvm::Function &llvm_function);
//------------------------------------------------------------------
/// A function-level pass to take the generated global value
@@ -382,19 +445,7 @@
MaybeHandleCallArguments (llvm::CallInst *call_inst);
//------------------------------------------------------------------
- /// Handle a single external function call
- ///
- /// @param[in] C
- /// The call instruction.
- ///
- /// @return
- /// True on success; false otherwise
- //------------------------------------------------------------------
- bool
- MaybeHandleCall (llvm::CallInst *C);
-
- //------------------------------------------------------------------
- /// Resolve calls to external functions
+ /// Resolve variable references in calls to external functions
///
/// @param[in] basic_block
/// The basic block currently being processed.
Modified: lldb/trunk/source/Expression/ASTResultSynthesizer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ASTResultSynthesizer.cpp?rev=136928&r1=136927&r2=136928&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ASTResultSynthesizer.cpp (original)
+++ lldb/trunk/source/Expression/ASTResultSynthesizer.cpp Thu Aug 4 16:37:47 2011
@@ -311,7 +311,12 @@
if (is_lvalue)
{
- IdentifierInfo &result_ptr_id = Ctx.Idents.get("$__lldb_expr_result_ptr");
+ IdentifierInfo *result_ptr_id;
+
+ if (expr_type->isFunctionType())
+ result_ptr_id = &Ctx.Idents.get("$__lldb_expr_result"); // functions actually should be treated like function pointers
+ else
+ result_ptr_id = &Ctx.Idents.get("$__lldb_expr_result_ptr");
QualType ptr_qual_type = Ctx.getPointerType(expr_qual_type);
@@ -319,7 +324,7 @@
DC,
SourceLocation(),
SourceLocation(),
- &result_ptr_id,
+ result_ptr_id,
ptr_qual_type,
NULL,
SC_Static,
Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=136928&r1=136927&r2=136928&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Thu Aug 4 16:37:47 2011
@@ -169,6 +169,146 @@
return false;
}
+bool
+IRForTarget::GetFunctionAddress (llvm::Function *fun,
+ uint64_t &fun_addr,
+ lldb_private::ConstString &name,
+ Constant **&value_ptr)
+{
+ lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+
+ fun_addr = LLDB_INVALID_ADDRESS;
+ name.Clear();
+ value_ptr = NULL;
+
+ if (fun->isIntrinsic())
+ {
+ Intrinsic::ID intrinsic_id = (Intrinsic::ID)fun->getIntrinsicID();
+
+ switch (intrinsic_id)
+ {
+ default:
+ if (log)
+ log->Printf("Unresolved intrinsic \"%s\"", Intrinsic::getName(intrinsic_id).c_str());
+
+ if (m_error_stream)
+ m_error_stream->Printf("Internal error [IRForTarget]: Call to unhandled compiler intrinsic '%s'\n", Intrinsic::getName(intrinsic_id).c_str());
+
+ return false;
+ case Intrinsic::memcpy:
+ {
+ static lldb_private::ConstString g_memcpy_str ("memcpy");
+ name = g_memcpy_str;
+ }
+ break;
+ }
+
+ if (log && name)
+ log->Printf("Resolved intrinsic name \"%s\"", name.GetCString());
+ }
+ else
+ {
+ name.SetCStringWithLength (fun->getName().data(), fun->getName().size());
+ }
+
+ // Find the address of the function.
+
+ clang::NamedDecl *fun_decl = DeclForGlobal (fun);
+ Value **fun_value_ptr = NULL;
+
+ if (fun_decl)
+ {
+ if (!m_decl_map->GetFunctionInfo (fun_decl, fun_value_ptr, fun_addr))
+ {
+ fun_value_ptr = NULL;
+
+ if (!m_decl_map->GetFunctionAddress (name, fun_addr))
+ {
+ if (log)
+ log->Printf("Function \"%s\" had no address", name.GetCString());
+
+ if (m_error_stream)
+ m_error_stream->Printf("Error [IRForTarget]: Call to a function '%s' that is not present in the target\n", name.GetCString());
+
+ return false;
+ }
+ }
+ }
+ else
+ {
+ if (!m_decl_map->GetFunctionAddress (name, fun_addr))
+ {
+ if (log)
+ log->Printf ("Metadataless function \"%s\" had no address", name.GetCString());
+
+ if (m_error_stream)
+ m_error_stream->Printf("Error [IRForTarget]: Call to a symbol-only function '%s' that is not present in the target\n", name.GetCString());
+
+ return false;
+ }
+ }
+
+ if (log)
+ log->Printf("Found \"%s\" at 0x%llx", name.GetCString(), fun_addr);
+
+ return true;
+}
+
+llvm::Constant *
+IRForTarget::BuildFunctionPointer (llvm::Type *type,
+ uint64_t ptr)
+{
+ IntegerType *intptr_ty = Type::getIntNTy(m_module->getContext(),
+ (m_module->getPointerSize() == Module::Pointer64) ? 64 : 32);
+ PointerType *fun_ptr_ty = PointerType::getUnqual(type);
+ Constant *fun_addr_int = ConstantInt::get(intptr_ty, ptr, false);
+ return ConstantExpr::getIntToPtr(fun_addr_int, fun_ptr_ty);
+}
+
+bool
+IRForTarget::ResolveFunctionPointers(llvm::Module &llvm_module,
+ llvm::Function &llvm_function)
+{
+ lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+
+ for (llvm::Module::iterator fi = llvm_module.begin();
+ fi != llvm_module.end();
+ ++fi)
+ {
+ Function *fun = fi;
+
+ bool is_decl = fun->isDeclaration();
+
+ if (log)
+ log->Printf("Examining %s function %s", (is_decl ? "declaration" : "non-declaration"), fun->getNameStr().c_str());
+
+ if (!is_decl)
+ continue;
+
+ if (fun->hasNUses(0))
+ continue; // ignore
+
+ uint64_t addr = LLDB_INVALID_ADDRESS;
+ lldb_private::ConstString name;
+ Constant **value_ptr = NULL;
+
+ if (!GetFunctionAddress(fun,
+ addr,
+ name,
+ value_ptr))
+ return false; // GetFunctionAddress reports its own errors
+
+ Constant *value = BuildFunctionPointer(fun->getFunctionType(), addr);
+
+ if (value_ptr)
+ *value_ptr = value;
+
+ fun->replaceAllUsesWith(value);
+ }
+
+ return true;
+}
+
clang::NamedDecl *
IRForTarget::DeclForGlobal (GlobalValue *global_val)
{
@@ -1403,193 +1543,6 @@
}
bool
-IRForTarget::MaybeHandleCall (CallInst *llvm_call_inst)
-{
- lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-
- Function *fun = llvm_call_inst->getCalledFunction();
-
- bool is_bitcast = false;
-
- // If the call is to something other than a plain llvm::Function, resolve which
- // Function is meant or give up.
-
- if (fun == NULL)
- {
- Value *val = llvm_call_inst->getCalledValue();
-
- ConstantExpr *const_expr = dyn_cast(val);
- LoadInst *load_inst = dyn_cast(val);
-
- if (const_expr && const_expr->getOpcode() == Instruction::BitCast)
- {
- fun = dyn_cast(const_expr->getOperand(0));
-
- if (!fun)
- {
- if (m_error_stream)
- m_error_stream->Printf("Internal error [IRForTaget]: Called entity is a cast of something not a function\n");
-
- return false;
- }
-
- is_bitcast = true;
- }
- else if (const_expr && const_expr->getOpcode() == Instruction::IntToPtr)
- {
- return true; // already resolved
- }
- else if (load_inst)
- {
- return true; // virtual method call
- }
- else
- {
- if (m_error_stream)
- m_error_stream->Printf("Internal error [IRForTarget]: Called entity is not a function\n");
-
- return false;
- }
- }
-
- // Determine the name of the called function, which is needed to find the address.
- // Intrinsics are special-cased.
-
- lldb_private::ConstString str;
-
- if (fun->isIntrinsic())
- {
- Intrinsic::ID intrinsic_id = (Intrinsic::ID)fun->getIntrinsicID();
-
- switch (intrinsic_id)
- {
- default:
- if (log)
- log->Printf("Unresolved intrinsic \"%s\"", Intrinsic::getName(intrinsic_id).c_str());
-
- if (m_error_stream)
- m_error_stream->Printf("Internal error [IRForTarget]: Call to unhandled compiler intrinsic '%s'\n", Intrinsic::getName(intrinsic_id).c_str());
-
- return false;
- case Intrinsic::memcpy:
- {
- static lldb_private::ConstString g_memcpy_str ("memcpy");
- str = g_memcpy_str;
- }
- break;
- }
-
- if (log && str)
- log->Printf("Resolved intrinsic name \"%s\"", str.GetCString());
- }
- else
- {
- str.SetCStringWithLength (fun->getName().data(), fun->getName().size());
- }
-
- // Find the address of the function, and the type if possible.
-
- clang::NamedDecl *fun_decl = DeclForGlobal (fun);
- lldb::addr_t fun_addr = LLDB_INVALID_ADDRESS;
- Value **fun_value_ptr = NULL;
-
- if (fun_decl)
- {
- if (!m_decl_map->GetFunctionInfo (fun_decl, fun_value_ptr, fun_addr))
- {
- fun_value_ptr = NULL;
-
- if (!m_decl_map->GetFunctionAddress (str, fun_addr))
- {
- if (log)
- log->Printf("Function \"%s\" had no address", str.GetCString());
-
- if (m_error_stream)
- m_error_stream->Printf("Error [IRForTarget]: Call to a function '%s' that is not present in the target\n", str.GetCString());
-
- return false;
- }
- }
- }
- else
- {
- if (!m_decl_map->GetFunctionAddress (str, fun_addr))
- {
- if (log)
- log->Printf ("Metadataless function \"%s\" had no address", str.GetCString());
-
- if (m_error_stream)
- m_error_stream->Printf("Error [IRForTarget]: Call to a symbol-only function '%s' that is not present in the target\n", str.GetCString());
-
- return false;
- }
- }
-
- if (log)
- log->Printf("Found \"%s\" at 0x%llx", str.GetCString(), fun_addr);
-
- // Construct the typed pointer to the function.
-
- Value *fun_addr_ptr = NULL;
-
- if (!fun_value_ptr || !*fun_value_ptr)
- {
- IntegerType *intptr_ty = Type::getIntNTy(m_module->getContext(),
- (m_module->getPointerSize() == Module::Pointer64) ? 64 : 32);
- FunctionType *fun_ty = fun->getFunctionType();
- PointerType *fun_ptr_ty = PointerType::getUnqual(fun_ty);
- Constant *fun_addr_int = ConstantInt::get(intptr_ty, fun_addr, false);
- fun_addr_ptr = ConstantExpr::getIntToPtr(fun_addr_int, fun_ptr_ty);
-
- if (fun_value_ptr)
- *fun_value_ptr = fun_addr_ptr;
- }
-
- if (fun_value_ptr)
- fun_addr_ptr = *fun_value_ptr;
-
- if (is_bitcast)
- {
- Value *val = llvm_call_inst->getCalledValue();
-
- ConstantExpr *const_expr = dyn_cast(val);
-
- Constant *fun_addr_ptr_cst = dyn_cast(fun_addr_ptr);
-
- if (!fun_addr_ptr_cst)
- {
- if (m_error_stream)
- m_error_stream->Printf("Error [IRForTarget]: Non-constant source function '%s' has a constant BitCast\n", str.GetCString());
-
- return false;
- }
-
- Constant *new_bit_cast = ConstantExpr::getBitCast(fun_addr_ptr_cst, const_expr->getType());
-
- llvm_call_inst->setCalledFunction(new_bit_cast);
- }
- else
- {
- llvm_call_inst->setCalledFunction(fun_addr_ptr);
- }
-
- ConstantArray *func_name = (ConstantArray*)ConstantArray::get(m_module->getContext(), str.GetCString());
-
- Value *values[1];
- values[0] = func_name;
- ArrayRef value_ref(values, 1);
-
- MDNode *func_metadata = MDNode::get(m_module->getContext(), value_ref);
-
- llvm_call_inst->setMetadata("lldb.call.realName", func_metadata);
-
- if (log)
- log->Printf("Set metadata for %p [%d, \"%s\"]", llvm_call_inst, func_name->isString(), func_name->getAsString().c_str());
-
- return true;
-}
-
-bool
IRForTarget::ResolveCalls(BasicBlock &basic_block)
{
/////////////////////////////////////////////////////////////////////////
@@ -1606,10 +1559,6 @@
CallInst *call = dyn_cast(&inst);
- // MaybeHandleCall handles error reporting; we are silent here
- if (call && !MaybeHandleCall(call))
- return false;
-
// MaybeHandleCallArguments handles error reporting; we are silent here
if (call && !MaybeHandleCallArguments(call))
return false;
@@ -2385,6 +2334,20 @@
return false;
}
+ ///////////////////////////////
+ // Resolve function pointers
+ //
+
+ if (!ResolveFunctionPointers(llvm_module, *function))
+ {
+ if (log)
+ log->Printf("ResolveFunctionPointers() failed");
+
+ // ResolveFunctionPointers() reports its own errors, so we don't do so here
+
+ return false;
+ }
+
//////////////////////////////////
// Run basic-block level passes
//
From johnny.chen at apple.com Thu Aug 4 17:01:21 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Thu, 04 Aug 2011 22:01:21 -0000
Subject: [Lldb-commits] [lldb] r136931 - in
/lldb/trunk/test/benchmarks/disassembly: ./ TestDisassembly.py
Message-ID: <20110804220122.21F502A6C12C@llvm.org>
Author: johnny
Date: Thu Aug 4 17:01:21 2011
New Revision: 136931
URL: http://llvm.org/viewvc/llvm-project?rev=136931&view=rev
Log:
Add a benchmark comparing lldb vs. gdb with disassembly on a large function (lldb's Driver::MainLoop()).
Sample run on my OSX Lion (MacBook Pro):
1: test_run_gdb_then_lldb (TestDisassembly.DisassembleDriverMainLoop)
Test disassembly on a large function with lldb vs. gdb. ...
gdb benchmark: Avg: 0.201802 (Laps: 5, Total Elapsed Time: 1.009008)
lldb benchmark: Avg: 0.109569 (Laps: 5, Total Elapsed Time: 0.547843)
lldb_avg/gdb_avg: 0.542952
ok
2: test_run_lldb_then_gdb (TestDisassembly.DisassembleDriverMainLoop)
Test disassembly on a large function with lldb vs. gdb. ...
lldb benchmark: Avg: 0.109580 (Laps: 5, Total Elapsed Time: 0.547902)
gdb benchmark: Avg: 0.201587 (Laps: 5, Total Elapsed Time: 1.007936)
lldb_avg/gdb_avg: 0.543588
ok
Added:
lldb/trunk/test/benchmarks/disassembly/
lldb/trunk/test/benchmarks/disassembly/TestDisassembly.py
Added: lldb/trunk/test/benchmarks/disassembly/TestDisassembly.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/disassembly/TestDisassembly.py?rev=136931&view=auto
==============================================================================
--- lldb/trunk/test/benchmarks/disassembly/TestDisassembly.py (added)
+++ lldb/trunk/test/benchmarks/disassembly/TestDisassembly.py Thu Aug 4 17:01:21 2011
@@ -0,0 +1,127 @@
+"""Disassemble lldb's Driver::MainLoop() functions comparing lldb against gdb."""
+
+import os, sys
+import unittest2
+import lldb
+import pexpect
+from lldbbench import *
+
+class DisassembleDriverMainLoop(BenchBase):
+
+ mydir = os.path.join("benchmarks", "example")
+
+ def setUp(self):
+ BenchBase.setUp(self)
+ self.exe = self.lldbExec
+ self.function = 'Driver::MainLoop()'
+ self.lldb_avg = None
+ self.gdb_avg = None
+
+ @benchmarks_test
+ def test_run_lldb_then_gdb(self):
+ """Test disassembly on a large function with lldb vs. gdb."""
+ print
+ self.run_lldb_disassembly(self.exe, self.function, 5)
+ print "lldb benchmark:", self.stopwatch
+ self.run_gdb_disassembly(self.exe, self.function, 5)
+ print "gdb benchmark:", self.stopwatch
+ print "lldb_avg/gdb_avg: %f" % (self.lldb_avg/self.gdb_avg)
+
+ @benchmarks_test
+ def test_run_gdb_then_lldb(self):
+ """Test disassembly on a large function with lldb vs. gdb."""
+ print
+ self.run_gdb_disassembly(self.exe, self.function, 5)
+ print "gdb benchmark:", self.stopwatch
+ self.run_lldb_disassembly(self.exe, self.function, 5)
+ print "lldb benchmark:", self.stopwatch
+ print "lldb_avg/gdb_avg: %f" % (self.lldb_avg/self.gdb_avg)
+
+ def run_lldb_disassembly(self, exe, function, count):
+ # Set self.child_prompt, which is "(lldb) ".
+ self.child_prompt = '(lldb) '
+ prompt = self.child_prompt
+
+ # So that the child gets torn down after the test.
+ self.child = pexpect.spawn('%s %s' % (self.lldbExec, exe))
+ child = self.child
+
+ # Turn on logging for what the child sends back.
+ if self.TraceOn():
+ child.logfile_read = sys.stdout
+
+ child.expect_exact(prompt)
+ child.sendline('breakpoint set -F %s' % function)
+ child.expect_exact(prompt)
+ child.sendline('run')
+ child.expect_exact(prompt)
+
+ # Reset the stopwatch now.
+ self.stopwatch.reset()
+ for i in range(count):
+ with self.stopwatch:
+ # Disassemble the function.
+ child.sendline('disassemble -f')
+ child.expect_exact(prompt)
+ child.sendline('next')
+ child.expect_exact(prompt)
+
+ child.sendline('quit')
+ try:
+ self.child.expect(pexpect.EOF)
+ except:
+ pass
+
+ self.lldb_avg = self.stopwatch.avg()
+ if self.TraceOn():
+ print "lldb disassembly benchmark:", str(self.stopwatch)
+ self.child = None
+
+ def run_gdb_disassembly(self, exe, function, count):
+ # Set self.child_prompt, which is "(gdb) ".
+ self.child_prompt = '(gdb) '
+ prompt = self.child_prompt
+
+ # So that the child gets torn down after the test.
+ self.child = pexpect.spawn('gdb %s' % exe)
+ child = self.child
+
+ # Turn on logging for what the child sends back.
+ if self.TraceOn():
+ child.logfile_read = sys.stdout
+
+ child.expect_exact(prompt)
+ child.sendline('break %s' % function)
+ child.expect_exact(prompt)
+ child.sendline('run')
+ child.expect_exact(prompt)
+
+ # Reset the stopwatch now.
+ self.stopwatch.reset()
+ for i in range(count):
+ with self.stopwatch:
+ # Disassemble the function.
+ child.sendline('disassemble')
+ child.expect_exact(prompt)
+ child.sendline('next')
+ child.expect_exact(prompt)
+
+ child.sendline('quit')
+ child.expect_exact('The program is running. Exit anyway?')
+ child.sendline('y')
+ try:
+ self.child.expect(pexpect.EOF)
+ except:
+ pass
+
+ self.gdb_avg = self.stopwatch.avg()
+ if self.TraceOn():
+ print "gdb disassembly benchmark:", str(self.stopwatch)
+ self.child = None
+
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
From johnny.chen at apple.com Thu Aug 4 17:05:37 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Thu, 04 Aug 2011 22:05:37 -0000
Subject: [Lldb-commits] [lldb] r136932 -
/lldb/trunk/test/benchmarks/example/TestRepeatedExprs.py
Message-ID: <20110804220537.14DE32A6C12C@llvm.org>
Author: johnny
Date: Thu Aug 4 17:05:36 2011
New Revision: 136932
URL: http://llvm.org/viewvc/llvm-project?rev=136932&view=rev
Log:
Print out the stopwatch (which contains laps, total elapsed time, and average)
instead of just the average.
Modified:
lldb/trunk/test/benchmarks/example/TestRepeatedExprs.py
Modified: lldb/trunk/test/benchmarks/example/TestRepeatedExprs.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/example/TestRepeatedExprs.py?rev=136932&r1=136931&r2=136932&view=diff
==============================================================================
--- lldb/trunk/test/benchmarks/example/TestRepeatedExprs.py (original)
+++ lldb/trunk/test/benchmarks/example/TestRepeatedExprs.py Thu Aug 4 17:05:36 2011
@@ -25,9 +25,9 @@
print
self.run_lldb_repeated_exprs(self.exe_name, 100)
+ print "lldb benchmark:", self.stopwatch
self.run_gdb_repeated_exprs(self.exe_name, 100)
- print "lldb_avg: %f" % self.lldb_avg
- print "gdb_avg: %f" % self.gdb_avg
+ print "gdb benchmark:", self.stopwatch
print "lldb_avg/gdb_avg: %f" % (self.lldb_avg/self.gdb_avg)
def run_lldb_repeated_exprs(self, exe_name, count):
From granata.enrico at gmail.com Thu Aug 4 18:37:19 2011
From: granata.enrico at gmail.com (Enrico Granata)
Date: Thu, 04 Aug 2011 23:37:19 -0000
Subject: [Lldb-commits] [lldb] r136945 - in /lldb/trunk:
include/lldb/Core/FormatManager.h include/lldb/lldb-enumerations.h
source/Core/ValueObject.cpp
Message-ID: <20110804233719.345272A6C12C@llvm.org>
Author: enrico
Date: Thu Aug 4 18:37:18 2011
New Revision: 136945
URL: http://llvm.org/viewvc/llvm-project?rev=136945&view=rev
Log:
fixed a potential memory leak ; small improvement in the formatters lookup algorithm
Modified:
lldb/trunk/include/lldb/Core/FormatManager.h
lldb/trunk/include/lldb/lldb-enumerations.h
lldb/trunk/source/Core/ValueObject.cpp
Modified: lldb/trunk/include/lldb/Core/FormatManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=136945&r1=136944&r2=136945&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatManager.h (original)
+++ lldb/trunk/include/lldb/Core/FormatManager.h Thu Aug 4 18:37:18 2011
@@ -351,16 +351,28 @@
return false;
}
ConstString name(ClangASTType::GetTypeNameForQualType(type).c_str());
+ const char* typeName = name.GetCString();
if (vobj.GetBitfieldBitSize() > 0)
{
// for bitfields, append size to the typename so one can custom format them
StreamString sstring;
- sstring.Printf("%s:%d",name.AsCString(),vobj.GetBitfieldBitSize());
- name = ConstString(sstring.GetData());
+ sstring.Printf("%s:%d",typeName,vobj.GetBitfieldBitSize());
+ ConstString bitfieldname = ConstString(sstring.GetData());
if (log)
- log->Printf("appended bitfield info, final result is %s", name.GetCString());
+ log->Printf("appended bitfield info, final result is %s", bitfieldname.GetCString());
+ if (Get(bitfieldname.AsCString(), entry))
+ {
+ if (log)
+ log->Printf("bitfield direct match found, returning");
+ return true;
+ }
+ else
+ {
+ reason |= lldb::eFormatterChoiceCriterionStrippedBitField;
+ if (log)
+ log->Printf("no bitfield direct match");
+ }
}
- const char* typeName = name.GetCString();
if (log)
log->Printf("trying to get %s for VO name %s of type %s",
m_name.c_str(),
Modified: lldb/trunk/include/lldb/lldb-enumerations.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-enumerations.h?rev=136945&r1=136944&r2=136945&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-enumerations.h (original)
+++ lldb/trunk/include/lldb/lldb-enumerations.h Thu Aug 4 18:37:18 2011
@@ -507,7 +507,8 @@
eFormatterChoiceCriterionNavigatedBaseClasses = 0x00000004,
eFormatterChoiceCriterionRegularExpressionSummary = 0x00000008,
eFormatterChoiceCriterionRegularExpressionFilter = 0x00000008,
- eFormatterChoiceCriterionDynamicObjCHierarchy = 0x00000010
+ eFormatterChoiceCriterionDynamicObjCHierarchy = 0x00000010,
+ eFormatterChoiceCriterionStrippedBitField = 0x00000020
} FormatterChoiceCriterion;
//----------------------------------------------------------------------
Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=136945&r1=136944&r2=136945&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Thu Aug 4 18:37:18 2011
@@ -953,7 +953,7 @@
SetFormat(custom_format);
const char * return_value;
- std::auto_ptr alloc_mem;
+ std::string alloc_mem;
switch(val_obj_display)
{
@@ -970,12 +970,11 @@
return_value = GetLocationAsCString();
break;
case eDisplayChildrenCount:
- // keep this out of the local scope so it will only get deleted when
- // we exit the function (..and we have a copy of the data into the Stream)
- alloc_mem = std::auto_ptr((char*)(return_value = new char[512]));
{
+ alloc_mem.resize(512);
+ return_value = &alloc_mem[0];
int count = GetNumChildren();
- snprintf(alloc_mem.get(), 512, "%d", count);
+ snprintf((char*)return_value, 512, "%d", count);
break;
}
default:
From johnny.chen at apple.com Thu Aug 4 19:07:41 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 00:07:41 -0000
Subject: [Lldb-commits] [lldb] r136947 - in
/lldb/trunk/test/python_api/default-constructor:
TestDefaultConstructorForAPIObjects.py sb_typemember.py
Message-ID: <20110805000741.509E92A6C12C@llvm.org>
Author: johnny
Date: Thu Aug 4 19:07:41 2011
New Revision: 136947
URL: http://llvm.org/viewvc/llvm-project?rev=136947&view=rev
Log:
Remove expectedFailure decorator for test_SBType, which does not take an empty constructor after the recent changes.
And remove expectedFailure decorator for test_SBTypeMember, which no longer exists after the recent changes, replace
it with test_SBTypeList.
Removed:
lldb/trunk/test/python_api/default-constructor/sb_typemember.py
Modified:
lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
Modified: lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py?rev=136947&r1=136946&r2=136947&view=diff
==============================================================================
--- lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py (original)
+++ lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py Thu Aug 4 19:07:41 2011
@@ -294,26 +294,29 @@
sb_thread.fuzz_obj(obj)
@python_api_test
- @unittest2.expectedFailure
def test_SBType(self):
- obj = lldb.SBType()
- if self.TraceOn():
- print obj
- self.assertFalse(obj)
+ try:
+ obj = lldb.SBType()
+ if self.TraceOn():
+ print obj
+ self.assertFalse(obj)
+ # If we reach here, the test fails.
+ self.fail("lldb.SBType() should fail, not succeed!")
+ except:
+ # Exception is expected.
+ return
+
+ # Unreachable code because lldb.SBType() should fail.
# Do fuzz testing on the invalid obj, it should not crash lldb.
import sb_type
sb_type.fuzz_obj(obj)
@python_api_test
- @unittest2.expectedFailure
- def test_SBTypeMember(self):
- obj = lldb.SBTypeMember()
+ def test_SBTypeList(self):
+ obj = lldb.SBTypeList()
if self.TraceOn():
print obj
- self.assertFalse(obj)
- # Do fuzz testing on the invalid obj, it should not crash lldb.
- import sb_typemember
- sb_typemember.fuzz_obj(obj)
+ self.assertTrue(obj)
@python_api_test
def test_SBValue(self):
Removed: lldb/trunk/test/python_api/default-constructor/sb_typemember.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/default-constructor/sb_typemember.py?rev=136946&view=auto
==============================================================================
--- lldb/trunk/test/python_api/default-constructor/sb_typemember.py (original)
+++ lldb/trunk/test/python_api/default-constructor/sb_typemember.py (removed)
@@ -1,18 +0,0 @@
-"""
-Fuzz tests an object after the default construction to make sure it does not crash lldb.
-"""
-
-import sys
-import lldb
-
-def fuzz_obj(obj):
- obj.IsBaseClass()
- obj.IsBitfield()
- obj.GetBitfieldWidth()
- obj.GetBitfieldOffset()
- obj.GetOffset()
- obj.GetName()
- obj.GetType()
- obj.GetParentType()
- obj.SetName("my_type_member_name")
- obj.Clear()
From peter at pcc.me.uk Thu Aug 4 19:35:43 2011
From: peter at pcc.me.uk (Peter Collingbourne)
Date: Fri, 05 Aug 2011 00:35:43 -0000
Subject: [Lldb-commits] [lldb] r136951 -
/lldb/trunk/source/Host/common/Host.cpp
Message-ID: <20110805003543.F18C72A6C12C@llvm.org>
Author: pcc
Date: Thu Aug 4 19:35:43 2011
New Revision: 136951
URL: http://llvm.org/viewvc/llvm-project?rev=136951&view=rev
Log:
Complete Host::Backtrace prototype. Fixes Linux build.
Modified:
lldb/trunk/source/Host/common/Host.cpp
Modified: lldb/trunk/source/Host/common/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=136951&r1=136950&r2=136951&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Host.cpp (original)
+++ lldb/trunk/source/Host/common/Host.cpp Thu Aug 4 19:35:43 2011
@@ -488,6 +488,7 @@
{
}
+void
Host::Backtrace (Stream &strm, uint32_t max_frames)
{
// TODO: Is there a way to backtrace the current process on linux? Other systems?
From granata.enrico at gmail.com Thu Aug 4 20:32:50 2011
From: granata.enrico at gmail.com (Enrico Granata)
Date: Fri, 05 Aug 2011 01:32:50 -0000
Subject: [Lldb-commits] [lldb] r136957 - in /lldb/trunk:
include/lldb/Core/FormatManager.h source/Commands/CommandObjectType.cpp
source/Commands/CommandObjectType.h
test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
test/functionalities/data-formatter/data-formatter-python-synth/main.cpp
Message-ID: <20110805013250.DD4112A6C12C@llvm.org>
Author: enrico
Date: Thu Aug 4 20:32:50 2011
New Revision: 136957
URL: http://llvm.org/viewvc/llvm-project?rev=136957&view=rev
Log:
Option --regex (-x) now also works for synthetic children:
- Added a test case in python-synth
Minor code improvements in categories, making them ready for adding new element types
Modified:
lldb/trunk/include/lldb/Core/FormatManager.h
lldb/trunk/source/Commands/CommandObjectType.cpp
lldb/trunk/source/Commands/CommandObjectType.h
lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp
Modified: lldb/trunk/include/lldb/Core/FormatManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=136957&r1=136956&r2=136957&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatManager.h (original)
+++ lldb/trunk/include/lldb/Core/FormatManager.h Thu Aug 4 20:32:50 2011
@@ -632,6 +632,17 @@
public:
+ enum FormatCategoryItem
+ {
+ eSummary = 0x0001,
+ eRegexSummary = 0x1001,
+ eFilter = 0x0002,
+ eRegexFilter = 0x1002,
+ };
+
+ typedef uint16_t FormatCategoryItems;
+ static const uint16_t ALL_ITEM_TYPES = 0xFFFF;
+
typedef SummaryNavigator::SharedPointer SummaryNavigatorSP;
typedef RegexSummaryNavigator::SharedPointer RegexSummaryNavigatorSP;
typedef FilterNavigator::SharedPointer FilterNavigatorSP;
@@ -715,24 +726,59 @@
void
ClearSummaries()
{
- m_summary_nav->Clear();
- m_regex_summary_nav->Clear();
+ Clear(eSummary | eRegexSummary);
}
// just a shortcut for (Summary()->Delete(name) || RegexSummary()->Delete(name))
bool
DeleteSummaries(const char* name)
{
- bool del_sum = m_summary_nav->Delete(name);
- bool del_rex = m_regex_summary_nav->Delete(name);
-
- return (del_sum || del_rex);
+ return Delete(name, (eSummary | eRegexSummary));
+ }
+
+
+ void
+ Clear(FormatCategoryItems items = ALL_ITEM_TYPES)
+ {
+ if ( (items & eSummary) )
+ m_summary_nav->Clear();
+ if ( (items & eRegexSummary) )
+ m_regex_summary_nav->Clear();
+ if ( (items & eFilter) )
+ m_filter_nav->Clear();
+ if ( (items & eRegexFilter) )
+ m_regex_filter_nav->Clear();
+ }
+
+ bool
+ Delete(const char* name,
+ FormatCategoryItems items = ALL_ITEM_TYPES)
+ {
+ bool success = false;
+ if ( (items & eSummary) )
+ success = m_summary_nav->Delete(name) || success;
+ if ( (items & eRegexSummary) )
+ success = m_regex_summary_nav->Delete(name) || success;
+ if ( (items & eFilter) )
+ success = m_filter_nav->Delete(name) || success;
+ if ( (items & eRegexFilter) )
+ success = m_regex_filter_nav->Delete(name) || success;
+ return success;
}
uint32_t
- GetCount()
+ GetCount(FormatCategoryItems items = ALL_ITEM_TYPES)
{
- return Summary()->GetCount() + RegexSummary()->GetCount();
+ uint32_t count = 0;
+ if ( (items & eSummary) )
+ count += m_summary_nav->GetCount();
+ if ( (items & eRegexSummary) )
+ count += m_regex_summary_nav->GetCount();
+ if ( (items & eFilter) )
+ count += m_filter_nav->GetCount();
+ if ( (items & eRegexFilter) )
+ count += m_regex_filter_nav->GetCount();
+ return count;
}
std::string
Modified: lldb/trunk/source/Commands/CommandObjectType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.cpp?rev=136957&r1=136956&r2=136957&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectType.cpp Thu Aug 4 20:32:50 2011
@@ -1168,8 +1168,7 @@
const FormatCategory::SharedPointer& cate)
{
const char* name = (const char*)param;
- cate->Summary()->Delete(name);
- cate->RegexSummary()->Delete(name);
+ cate->Delete(name, FormatCategory::eSummary | FormatCategory::eRegexSummary);
return true;
}
@@ -1892,6 +1891,7 @@
//-------------------------------------------------------------------------
bool CommandObjectTypeSynthList_LoopCallback(void* pt2self, const char* type, const SyntheticFilter::SharedPointer& entry);
+bool CommandObjectTypeSynthRXList_LoopCallback(void* pt2self, lldb::RegularExpressionSP regex, const SyntheticFilter::SharedPointer& entry);
class CommandObjectTypeSynthList;
@@ -2044,6 +2044,12 @@
cate->Filter()->LoopThrough(CommandObjectTypeSynthList_LoopCallback, param_vp);
+ if (cate->RegexFilter()->GetCount() > 0)
+ {
+ result->GetOutputStream().Printf("Regex-based filters (slower):\n");
+ cate->RegexFilter()->LoopThrough(CommandObjectTypeSynthRXList_LoopCallback, param_vp);
+ }
+
return true;
}
@@ -2059,6 +2065,7 @@
}
friend bool CommandObjectTypeSynthList_LoopCallback(void* pt2self, const char* type, const SyntheticFilter::SharedPointer& entry);
+ friend bool CommandObjectTypeSynthRXList_LoopCallback(void* pt2self, lldb::RegularExpressionSP regex, const SyntheticFilter::SharedPointer& entry);
};
bool
@@ -2070,6 +2077,15 @@
return param->self->LoopCallback(type, entry, param->regex, param->result);
}
+bool
+CommandObjectTypeSynthRXList_LoopCallback (void* pt2self,
+ lldb::RegularExpressionSP regex,
+ const SyntheticFilter::SharedPointer& entry)
+{
+ CommandObjectTypeSynthList_LoopCallbackParam* param = (CommandObjectTypeSynthList_LoopCallbackParam*)pt2self;
+ return param->self->LoopCallback(regex->GetText(), entry, param->regex, param->result);
+}
+
OptionDefinition
CommandObjectTypeSynthList::CommandOptions::g_option_table[] =
@@ -2157,8 +2173,7 @@
const FormatCategory::SharedPointer& cate)
{
const char* name = (const char*)param;
- cate->Filter()->Delete(name);
- return true;
+ return cate->Delete(name, FormatCategory::eFilter | FormatCategory::eRegexFilter);
}
public:
@@ -2217,6 +2232,7 @@
Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
bool delete_category = category->Filter()->Delete(typeCS.GetCString());
+ delete_category = category->RegexFilter()->Delete(typeCS.GetCString()) || delete_category;
if (delete_category)
{
@@ -2315,7 +2331,7 @@
const char* cate_name,
const FormatCategory::SharedPointer& cate)
{
- cate->Filter()->Clear();
+ cate->Clear(FormatCategory::eFilter | FormatCategory::eRegexFilter);
return true;
}
@@ -2352,6 +2368,7 @@
else
Debugger::Formatting::Categories::Get(ConstString(NULL), category);
category->Filter()->Clear();
+ category->RegexFilter()->Clear();
}
result.SetStatus(eReturnStatusSuccessFinishResult);
@@ -2506,7 +2523,11 @@
const char *type_name = options->m_target_types.GetStringAtIndex(i);
ConstString typeCS(type_name);
if (typeCS)
- category->Filter()->Add(typeCS.GetCString(), synth_provider);
+ CommandObjectTypeSynthAdd::AddSynth(typeCS,
+ synth_provider,
+ options->m_regex ? CommandObjectTypeSynthAdd::eRegexSynth : CommandObjectTypeSynthAdd::eRegularSynth,
+ options->m_category,
+ NULL);
else
{
out_stream->Printf ("Internal error #6: no script attached.\n");
@@ -2517,319 +2538,242 @@
}
};
-class CommandObjectTypeSynthAdd : public CommandObject
+void
+CommandObjectTypeSynthAdd::CollectPythonScript (SynthAddOptions *options,
+ CommandReturnObject &result)
{
-
-private:
-
- class CommandOptions : public Options
+ InputReaderSP reader_sp (new TypeSynthAddInputReader(m_interpreter.GetDebugger()));
+ if (reader_sp && options)
{
- typedef std::vector option_vector;
- public:
- CommandOptions (CommandInterpreter &interpreter) :
- Options (interpreter)
- {
- }
+ InputReaderEZ::InitializationParameters ipr;
- virtual
- ~CommandOptions (){}
-
- virtual Error
- SetOptionValue (uint32_t option_idx, const char *option_arg)
+ Error err (reader_sp->Initialize (ipr.SetBaton(options).SetPrompt(" ")));
+ if (err.Success())
{
- Error error;
- char short_option = (char) m_getopt_table[option_idx].val;
- bool success;
-
- switch (short_option)
- {
- case 'C':
- m_cascade = Args::StringToBoolean(option_arg, true, &success);
- if (!success)
- error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
- break;
- case 'c':
- m_expr_paths.push_back(option_arg);
- has_child_list = true;
- break;
- case 'P':
- handwrite_python = true;
- break;
- case 'l':
- m_class_name = std::string(option_arg);
- is_class_based = true;
- break;
- case 'p':
- m_skip_pointers = true;
- break;
- case 'r':
- m_skip_references = true;
- break;
- case 'w':
- m_category = ConstString(option_arg).GetCString();
- break;
- default:
- error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
- break;
- }
-
- return error;
+ m_interpreter.GetDebugger().PushInputReader (reader_sp);
+ result.SetStatus (eReturnStatusSuccessFinishNoResult);
}
-
- void
- OptionParsingStarting ()
+ else
{
- m_cascade = true;
- m_class_name = "";
- m_skip_pointers = false;
- m_skip_references = false;
- m_category = NULL;
- m_expr_paths.clear();
- is_class_based = false;
- handwrite_python = false;
- has_child_list = false;
+ result.AppendError (err.AsCString());
+ result.SetStatus (eReturnStatusFailed);
}
-
- const OptionDefinition*
- GetDefinitions ()
+ }
+ else
+ {
+ result.AppendError("out of memory");
+ result.SetStatus (eReturnStatusFailed);
+ }
+}
+
+bool
+CommandObjectTypeSynthAdd::Execute_HandwritePython (Args& command, CommandReturnObject &result)
+{
+ SynthAddOptions *options = new SynthAddOptions ( m_options.m_skip_pointers,
+ m_options.m_skip_references,
+ m_options.m_cascade,
+ m_options.m_regex,
+ m_options.m_category);
+
+ const size_t argc = command.GetArgumentCount();
+
+ for (size_t i = 0; i < argc; i++) {
+ const char* typeA = command.GetArgumentAtIndex(i);
+ if (typeA && *typeA)
+ options->m_target_types << typeA;
+ else
{
- return g_option_table;
+ result.AppendError("empty typenames not allowed");
+ result.SetStatus(eReturnStatusFailed);
+ return false;
}
-
- // Options table: Required for subclasses of Options.
-
- static OptionDefinition g_option_table[];
-
- // Instance variables to hold the values for command options.
-
- bool m_cascade;
- bool m_skip_references;
- bool m_skip_pointers;
- std::string m_class_name;
- bool m_input_python;
- option_vector m_expr_paths;
- const char* m_category;
-
- bool is_class_based;
-
- bool handwrite_python;
-
- bool has_child_list;
-
- typedef option_vector::iterator ExpressionPathsIterator;
- };
+ }
- CommandOptions m_options;
+ CollectPythonScript(options,result);
+ return result.Succeeded();
+}
- virtual Options *
- GetOptions ()
+bool
+CommandObjectTypeSynthAdd::Execute_ChildrenList (Args& command, CommandReturnObject &result)
+{
+ const size_t argc = command.GetArgumentCount();
+
+ if (argc < 1)
{
- return &m_options;
+ result.AppendErrorWithFormat ("%s takes one or more args.\n", m_cmd_name.c_str());
+ result.SetStatus(eReturnStatusFailed);
+ return false;
}
- void
- CollectPythonScript (SynthAddOptions *options,
- CommandReturnObject &result)
+ if (m_options.m_expr_paths.size() == 0)
{
- InputReaderSP reader_sp (new TypeSynthAddInputReader(m_interpreter.GetDebugger()));
- if (reader_sp && options)
- {
-
- InputReaderEZ::InitializationParameters ipr;
-
- Error err (reader_sp->Initialize (ipr.SetBaton(options).SetPrompt(" ")));
- if (err.Success())
- {
- m_interpreter.GetDebugger().PushInputReader (reader_sp);
- result.SetStatus (eReturnStatusSuccessFinishNoResult);
- }
- else
- {
- result.AppendError (err.AsCString());
- result.SetStatus (eReturnStatusFailed);
- }
- }
+ result.AppendErrorWithFormat ("%s needs one or more children.\n", m_cmd_name.c_str());
+ result.SetStatus(eReturnStatusFailed);
+ return false;
+ }
+
+ SyntheticChildrenSP entry;
+
+ SyntheticFilter* impl = new SyntheticFilter(m_options.m_cascade,
+ m_options.m_skip_pointers,
+ m_options.m_skip_references);
+
+ entry.reset(impl);
+
+ // go through the expression paths
+ CommandOptions::ExpressionPathsIterator begin, end = m_options.m_expr_paths.end();
+
+ for (begin = m_options.m_expr_paths.begin(); begin != end; begin++)
+ impl->AddExpressionPath(*begin);
+
+
+ // now I have a valid provider, let's add it to every type
+
+ lldb::FormatCategorySP category;
+ Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
+
+ for (size_t i = 0; i < argc; i++) {
+ const char* typeA = command.GetArgumentAtIndex(i);
+ ConstString typeCS(typeA);
+ if (typeCS)
+ AddSynth(typeCS,
+ entry,
+ m_options.m_regex ? eRegexSynth : eRegularSynth,
+ m_options.m_category,
+ NULL);
else
{
- result.AppendError("out of memory");
- result.SetStatus (eReturnStatusFailed);
+ result.AppendError("empty typenames not allowed");
+ result.SetStatus(eReturnStatusFailed);
+ return false;
}
}
- bool
- Execute_HandwritePython (Args& command, CommandReturnObject &result)
+ result.SetStatus(eReturnStatusSuccessFinishNoResult);
+ return result.Succeeded();
+}
+
+bool
+CommandObjectTypeSynthAdd::Execute_PythonClass (Args& command, CommandReturnObject &result)
+{
+ const size_t argc = command.GetArgumentCount();
+
+ if (argc < 1)
{
- SynthAddOptions *options = new SynthAddOptions ( m_options.m_skip_pointers,
- m_options.m_skip_references,
- m_options.m_cascade,
- m_options.m_category);
-
- const size_t argc = command.GetArgumentCount();
-
- for (size_t i = 0; i < argc; i++) {
- const char* typeA = command.GetArgumentAtIndex(i);
- if (typeA && *typeA)
- options->m_target_types << typeA;
- else
- {
- result.AppendError("empty typenames not allowed");
- result.SetStatus(eReturnStatusFailed);
- return false;
- }
- }
-
- CollectPythonScript(options,result);
- return result.Succeeded();
+ result.AppendErrorWithFormat ("%s takes one or more args.\n", m_cmd_name.c_str());
+ result.SetStatus(eReturnStatusFailed);
+ return false;
}
- bool
- Execute_ChildrenList (Args& command, CommandReturnObject &result)
+ if (m_options.m_class_name.empty() && !m_options.m_input_python)
{
- const size_t argc = command.GetArgumentCount();
-
- if (argc < 1)
- {
- result.AppendErrorWithFormat ("%s takes one or more args.\n", m_cmd_name.c_str());
- result.SetStatus(eReturnStatusFailed);
- return false;
- }
-
- if (m_options.m_expr_paths.size() == 0)
+ result.AppendErrorWithFormat ("%s needs either a Python class name or -P to directly input Python code.\n", m_cmd_name.c_str());
+ result.SetStatus(eReturnStatusFailed);
+ return false;
+ }
+
+ SyntheticChildrenSP entry;
+
+ SyntheticScriptProvider* impl = new SyntheticScriptProvider(m_options.m_cascade,
+ m_options.m_skip_pointers,
+ m_options.m_skip_references,
+ m_options.m_class_name);
+
+ entry.reset(impl);
+
+ // now I have a valid provider, let's add it to every type
+
+ lldb::FormatCategorySP category;
+ Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
+
+ for (size_t i = 0; i < argc; i++) {
+ const char* typeA = command.GetArgumentAtIndex(i);
+ ConstString typeCS(typeA);
+ if (typeCS)
+ AddSynth(typeCS,
+ entry,
+ m_options.m_regex ? eRegexSynth : eRegularSynth,
+ m_options.m_category,
+ NULL);
+ else
{
- result.AppendErrorWithFormat ("%s needs one or more children.\n", m_cmd_name.c_str());
+ result.AppendError("empty typenames not allowed");
result.SetStatus(eReturnStatusFailed);
return false;
}
-
- SyntheticChildrenSP entry;
-
- SyntheticFilter* impl = new SyntheticFilter(m_options.m_cascade,
- m_options.m_skip_pointers,
- m_options.m_skip_references);
-
- entry.reset(impl);
-
- // go through the expression paths
- CommandOptions::ExpressionPathsIterator begin, end = m_options.m_expr_paths.end();
-
- for (begin = m_options.m_expr_paths.begin(); begin != end; begin++)
- impl->AddExpressionPath(*begin);
-
-
- // now I have a valid provider, let's add it to every type
-
- lldb::FormatCategorySP category;
- Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
-
- for (size_t i = 0; i < argc; i++) {
- const char* typeA = command.GetArgumentAtIndex(i);
- ConstString typeCS(typeA);
- if (typeCS)
- category->Filter()->Add(typeCS.GetCString(), entry);
- else
- {
- result.AppendError("empty typenames not allowed");
- result.SetStatus(eReturnStatusFailed);
- return false;
- }
- }
-
- result.SetStatus(eReturnStatusSuccessFinishNoResult);
- return result.Succeeded();
}
- bool
- Execute_PythonClass (Args& command, CommandReturnObject &result)
+ result.SetStatus(eReturnStatusSuccessFinishNoResult);
+ return result.Succeeded();
+}
+
+CommandObjectTypeSynthAdd::CommandObjectTypeSynthAdd (CommandInterpreter &interpreter) :
+CommandObject (interpreter,
+ "type synth add",
+ "Add a new synthetic provider for a type.",
+ NULL), m_options (interpreter)
+{
+ CommandArgumentEntry type_arg;
+ CommandArgumentData type_style_arg;
+
+ type_style_arg.arg_type = eArgTypeName;
+ type_style_arg.arg_repetition = eArgRepeatPlus;
+
+ type_arg.push_back (type_style_arg);
+
+ m_arguments.push_back (type_arg);
+
+}
+
+bool
+CommandObjectTypeSynthAdd::AddSynth(const ConstString& type_name,
+ SyntheticChildrenSP entry,
+ SynthFormatType type,
+ const char* category_name,
+ Error* error)
+{
+ lldb::FormatCategorySP category;
+ Debugger::Formatting::Categories::Get(ConstString(category_name), category);
+
+ if (type == eRegexSynth)
{
- const size_t argc = command.GetArgumentCount();
-
- if (argc < 1)
+ RegularExpressionSP typeRX(new RegularExpression());
+ if (!typeRX->Compile(type_name.GetCString()))
{
- result.AppendErrorWithFormat ("%s takes one or more args.\n", m_cmd_name.c_str());
- result.SetStatus(eReturnStatusFailed);
+ if (error)
+ error->SetErrorString("regex format error (maybe this is not really a regex?)");
return false;
}
- if (m_options.m_class_name.empty() && !m_options.m_input_python)
- {
- result.AppendErrorWithFormat ("%s needs either a Python class name or -P to directly input Python code.\n", m_cmd_name.c_str());
- result.SetStatus(eReturnStatusFailed);
- return false;
- }
-
- SyntheticChildrenSP entry;
-
- SyntheticScriptProvider* impl = new SyntheticScriptProvider(m_options.m_cascade,
- m_options.m_skip_pointers,
- m_options.m_skip_references,
- m_options.m_class_name);
-
- entry.reset(impl);
-
- // now I have a valid provider, let's add it to every type
-
- lldb::FormatCategorySP category;
- Debugger::Formatting::Categories::Get(ConstString(m_options.m_category), category);
-
- for (size_t i = 0; i < argc; i++) {
- const char* typeA = command.GetArgumentAtIndex(i);
- ConstString typeCS(typeA);
- if (typeCS)
- category->Filter()->Add(typeCS.GetCString(), entry);
- else
- {
- result.AppendError("empty typenames not allowed");
- result.SetStatus(eReturnStatusFailed);
- return false;
- }
- }
-
- result.SetStatus(eReturnStatusSuccessFinishNoResult);
- return result.Succeeded();
- }
-
-public:
-
- CommandObjectTypeSynthAdd (CommandInterpreter &interpreter) :
- CommandObject (interpreter,
- "type synth add",
- "Add a new synthetic provider for a type.",
- NULL), m_options (interpreter)
- {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back (type_style_arg);
-
- m_arguments.push_back (type_arg);
+ category->RegexFilter()->Delete(type_name.GetCString());
+ category->RegexFilter()->Add(typeRX, entry);
+ return true;
}
-
- ~CommandObjectTypeSynthAdd ()
+ else
{
+ category->Filter()->Add(type_name.GetCString(), entry);
+ return true;
}
+}
- bool
- Execute (Args& command, CommandReturnObject &result)
- {
- if (m_options.handwrite_python)
- return Execute_HandwritePython(command, result);
- else if (m_options.is_class_based)
- return Execute_PythonClass(command, result);
- else if (m_options.has_child_list)
- return Execute_ChildrenList(command, result);
- else
- {
- result.AppendError("must either provide a children list, a Python class name, or use -P and type a Python class line-by-line");
- result.SetStatus(eReturnStatusFailed);
- return false;
- }
+bool
+CommandObjectTypeSynthAdd::Execute (Args& command, CommandReturnObject &result)
+{
+ if (m_options.handwrite_python)
+ return Execute_HandwritePython(command, result);
+ else if (m_options.is_class_based)
+ return Execute_PythonClass(command, result);
+ else if (m_options.has_child_list)
+ return Execute_ChildrenList(command, result);
+ else
+ {
+ result.AppendError("must either provide a children list, a Python class name, or use -P and type a Python class line-by-line");
+ result.SetStatus(eReturnStatusFailed);
+ return false;
}
-};
+}
OptionDefinition
CommandObjectTypeSynthAdd::CommandOptions::g_option_table[] =
@@ -2841,6 +2785,7 @@
{ LLDB_OPT_SET_1, false, "child", 'c', required_argument, NULL, 0, eArgTypeName, "Include this expression path in the synthetic view."},
{ LLDB_OPT_SET_2, false, "python-class", 'l', required_argument, NULL, 0, eArgTypeName, "Use this Python class to produce synthetic children."},
{ LLDB_OPT_SET_3, false, "input-python", 'P', no_argument, NULL, 0, eArgTypeNone, "Type Python code to generate a class that provides synthetic children."},
+ { LLDB_OPT_SET_ALL, false, "regex", 'x', no_argument, NULL, 0, eArgTypeNone, "Type names are actually regular expressions."},
{ 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
};
Modified: lldb/trunk/source/Commands/CommandObjectType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.h?rev=136957&r1=136956&r2=136957&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.h (original)
+++ lldb/trunk/source/Commands/CommandObjectType.h Thu Aug 4 20:32:50 2011
@@ -78,6 +78,7 @@
bool m_skip_pointers;
bool m_skip_references;
bool m_cascade;
+ bool m_regex;
StringList m_user_source;
StringList m_target_types;
@@ -86,10 +87,12 @@
SynthAddOptions(bool sptr,
bool sref,
bool casc,
+ bool regx,
const char* catg) :
m_skip_pointers(sptr),
m_skip_references(sref),
m_cascade(casc),
+ m_regex(regx),
m_user_source(),
m_target_types(),
m_category(catg)
@@ -203,7 +206,157 @@
const char* category,
Error* error = NULL);
};
-
+
+class CommandObjectTypeSynthAdd : public CommandObject
+{
+
+private:
+
+ class CommandOptions : public Options
+ {
+ typedef std::vector option_vector;
+ public:
+
+ CommandOptions (CommandInterpreter &interpreter) :
+ Options (interpreter)
+ {
+ }
+
+ virtual
+ ~CommandOptions (){}
+
+ virtual Error
+ SetOptionValue (uint32_t option_idx, const char *option_arg)
+ {
+ Error error;
+ char short_option = (char) m_getopt_table[option_idx].val;
+ bool success;
+
+ switch (short_option)
+ {
+ case 'C':
+ m_cascade = Args::StringToBoolean(option_arg, true, &success);
+ if (!success)
+ error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
+ break;
+ case 'c':
+ m_expr_paths.push_back(option_arg);
+ has_child_list = true;
+ break;
+ case 'P':
+ handwrite_python = true;
+ break;
+ case 'l':
+ m_class_name = std::string(option_arg);
+ is_class_based = true;
+ break;
+ case 'p':
+ m_skip_pointers = true;
+ break;
+ case 'r':
+ m_skip_references = true;
+ break;
+ case 'w':
+ m_category = ConstString(option_arg).GetCString();
+ break;
+ case 'x':
+ m_regex = true;
+ break;
+ default:
+ error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+ break;
+ }
+
+ return error;
+ }
+
+ void
+ OptionParsingStarting ()
+ {
+ m_cascade = true;
+ m_class_name = "";
+ m_skip_pointers = false;
+ m_skip_references = false;
+ m_category = NULL;
+ m_expr_paths.clear();
+ is_class_based = false;
+ handwrite_python = false;
+ has_child_list = false;
+ m_regex = false;
+ }
+
+ const OptionDefinition*
+ GetDefinitions ()
+ {
+ return g_option_table;
+ }
+
+ // Options table: Required for subclasses of Options.
+
+ static OptionDefinition g_option_table[];
+
+ // Instance variables to hold the values for command options.
+
+ bool m_cascade;
+ bool m_skip_references;
+ bool m_skip_pointers;
+ std::string m_class_name;
+ bool m_input_python;
+ option_vector m_expr_paths;
+ const char* m_category;
+
+ bool is_class_based;
+
+ bool handwrite_python;
+
+ bool has_child_list;
+
+ bool m_regex;
+
+ typedef option_vector::iterator ExpressionPathsIterator;
+ };
+
+ CommandOptions m_options;
+
+ virtual Options *
+ GetOptions ()
+ {
+ return &m_options;
+ }
+
+ void
+ CollectPythonScript (SynthAddOptions *options,
+ CommandReturnObject &result);
+ bool
+ Execute_HandwritePython (Args& command, CommandReturnObject &result);
+ bool
+ Execute_ChildrenList (Args& command, CommandReturnObject &result);
+ bool
+ Execute_PythonClass (Args& command, CommandReturnObject &result);
+ bool
+ Execute (Args& command, CommandReturnObject &result);
+
+public:
+
+ enum SynthFormatType
+ {
+ eRegularSynth,
+ eRegexSynth,
+ };
+
+ CommandObjectTypeSynthAdd (CommandInterpreter &interpreter);
+
+ ~CommandObjectTypeSynthAdd ()
+ {
+ }
+
+ static bool
+ AddSynth(const ConstString& type_name,
+ lldb::SyntheticChildrenSP entry,
+ SynthFormatType type,
+ const char* category_name,
+ Error* error);
+};
} // namespace lldb_private
Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py?rev=136957&r1=136956&r2=136957&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py Thu Aug 4 20:32:50 2011
@@ -300,13 +300,14 @@
'[3] = \"!!!\"'])
# now std::map
+ # also take a chance to test regex synth here
self.runCmd("n")
self.runCmd("frame variable ii -T")
self.runCmd("script from StdMapSynthProvider import *")
- self.runCmd("type summary add std::intint_map intint_map -f \"map has ${svar%#} items\" -e")
- self.runCmd("type synth add std::intint_map intint_map -l StdMapSynthProvider")
+ self.runCmd("type summary add -x \"std::map<\" -f \"map has ${svar%#} items\" -e")
+ self.runCmd("type synth add -x \"std::map<\" -l StdMapSynthProvider")
self.expect('frame variable ii',
@@ -356,8 +357,8 @@
self.runCmd("n")
self.runCmd("frame variable si -T")
- self.runCmd("type summary add std::strint_map strint_map -f \"map has ${svar%#} items\" -e")
- self.runCmd("type synth add std::strint_map strint_map -l StdMapSynthProvider")
+ #self.runCmd("type summary add std::strint_map strint_map -f \"map has ${svar%#} items\" -e")
+ #self.runCmd("type synth add std::strint_map strint_map -l StdMapSynthProvider")
self.expect('frame variable si',
substrs = ['map has 0 items',
@@ -400,8 +401,8 @@
self.runCmd("n")
self.runCmd("frame variable is -T")
- self.runCmd("type summary add std::intstr_map intstr_map -f \"map has ${svar%#} items\" -e")
- self.runCmd("type synth add std::intstr_map intstr_map -l StdMapSynthProvider")
+ #self.runCmd("type summary add std::intstr_map intstr_map -f \"map has ${svar%#} items\" -e")
+ #self.runCmd("type synth add std::intstr_map intstr_map -l StdMapSynthProvider")
self.expect('frame variable is',
substrs = ['map has 0 items',
@@ -433,8 +434,8 @@
self.runCmd("n")
self.runCmd("frame variable ss -T")
- self.runCmd("type summary add std::strstr_map strstr_map -f \"map has ${svar%#} items\" -e")
- self.runCmd("type synth add std::strstr_map strstr_map -l StdMapSynthProvider")
+ #self.runCmd("type summary add std::strstr_map strstr_map -f \"map has ${svar%#} items\" -e")
+ #self.runCmd("type synth add std::strstr_map strstr_map -l StdMapSynthProvider")
self.expect('frame variable ss',
substrs = ['map has 0 items',
Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp?rev=136957&r1=136956&r2=136957&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp Thu Aug 4 20:32:50 2011
@@ -8,10 +8,10 @@
typedef std::list int_list;
typedef std::list string_list;
-typedef std::map intint_map;
-typedef std::map strint_map;
-typedef std::map intstr_map;
-typedef std::map strstr_map;
+#define intint_map std::map
+#define strint_map std::map
+#define intstr_map std::map
+#define strstr_map std::map
struct foo
{
From johnny.chen at apple.com Thu Aug 4 20:35:50 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 01:35:50 -0000
Subject: [Lldb-commits] [lldb] r136958 -
/lldb/trunk/scripts/Python/modify-python-lldb.py
Message-ID: <20110805013550.2847E2A6C12C@llvm.org>
Author: johnny
Date: Thu Aug 4 20:35:49 2011
New Revision: 136958
URL: http://llvm.org/viewvc/llvm-project?rev=136958&view=rev
Log:
The recently introduced SBTypeList is also iterable.
This patch takes some time because the old Python constructor pattern was not a valid one,
and breaks with SBTypeList's __init__ signature. Oops.
Modified:
lldb/trunk/scripts/Python/modify-python-lldb.py
Modified: lldb/trunk/scripts/Python/modify-python-lldb.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/modify-python-lldb.py?rev=136958&r1=136957&r2=136958&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/modify-python-lldb.py (original)
+++ lldb/trunk/scripts/Python/modify-python-lldb.py Thu Aug 4 20:35:49 2011
@@ -171,7 +171,8 @@
'SBInstructionList': ('GetSize', 'GetInstructionAtIndex'),
'SBStringList': ('GetSize', 'GetStringAtIndex',),
'SBSymbolContextList': ('GetSize', 'GetContextAtIndex'),
- 'SBValueList': ('GetSize', 'GetValueAtIndex'),
+ 'SBTypeList': ('GetSize', 'GetTypeAtIndex'),
+ 'SBValueList': ('GetSize', 'GetValueAtIndex'),
'SBType': ('GetNumberChildren', 'GetChildAtIndex'),
'SBValue': ('GetNumChildren', 'GetChildAtIndex'),
@@ -240,7 +241,7 @@
class_pattern = re.compile("^class (SB.*)\(_object\):$")
# The pattern for recognizing the beginning of the __init__ method definition.
-init_pattern = re.compile("^ def __init__\(self, \*args\):")
+init_pattern = re.compile("^ def __init__\(self.*\):")
# The pattern for recognizing the beginning of the IsValid method definition.
isvalid_pattern = re.compile("^ def IsValid\(")
From johnny.chen at apple.com Fri Aug 5 15:17:27 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 20:17:27 -0000
Subject: [Lldb-commits] [lldb] r136975 - in /lldb/trunk:
scripts/Python/modify-python-lldb.py test/lldbtest.py test/python_api/type/
test/python_api/type/Makefile test/python_api/type/TestTypeList.py
test/python_api/type/main.cpp
Message-ID: <20110805201727.B69352A6C12C@llvm.org>
Author: johnny
Date: Fri Aug 5 15:17:27 2011
New Revision: 136975
URL: http://llvm.org/viewvc/llvm-project?rev=136975&view=rev
Log:
o modify-python-lldb.py:
Add the rich comparison methods (__eq__, __ne__) to SBType, too.
o lldbtest.py:
Add debug utility method TestBase.DebugSBType().
o test/python_api/type:
Add tests for exercising SBType/SBTypeList API, including the SBTarget.FindTypes(type_name)
API which returns a SBTypeList matching the type_name.
Added:
lldb/trunk/test/python_api/type/
lldb/trunk/test/python_api/type/Makefile
lldb/trunk/test/python_api/type/TestTypeList.py
lldb/trunk/test/python_api/type/main.cpp
Modified:
lldb/trunk/scripts/Python/modify-python-lldb.py
lldb/trunk/test/lldbtest.py
Modified: lldb/trunk/scripts/Python/modify-python-lldb.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/modify-python-lldb.py?rev=136975&r1=136974&r2=136975&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/modify-python-lldb.py (original)
+++ lldb/trunk/scripts/Python/modify-python-lldb.py Fri Aug 5 15:17:27 2011
@@ -1,5 +1,5 @@
#
-# modify-lldb-python.py
+# modify-python-lldb.py
#
# This script modifies the lldb module (which was automatically generated via
# running swig) to support iteration and/or equality operations for certain lldb
@@ -189,7 +189,8 @@
e = { 'SBAddress': ['GetFileAddress', 'GetModule'],
'SBBreakpoint': ['GetID'],
'SBFileSpec': ['GetFilename', 'GetDirectory'],
- 'SBModule': ['GetFileSpec', 'GetUUIDString']
+ 'SBModule': ['GetFileSpec', 'GetUUIDString'],
+ 'SBType': ['GetByteSize', 'GetName']
}
def list_to_frag(list):
Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=136975&r1=136974&r2=136975&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Fri Aug 5 15:17:27 2011
@@ -1060,6 +1060,17 @@
err.write('\t' + "IsPointerType -> " + str(val.TypeIsPointerType()) + '\n')
err.write('\t' + "Location -> " + val.GetLocation() + '\n')
+ def DebugSBType(self, type):
+ """Debug print a SBType object, if traceAlways is True."""
+ if not traceAlways:
+ return
+
+ err = sys.stderr
+ err.write(type.GetName() + ":\n")
+ err.write('\t' + "ByteSize -> " + str(type.GetByteSize()) + '\n')
+ err.write('\t' + "IsPointerType -> " + str(type.IsPointerType()) + '\n')
+ err.write('\t' + "IsReferenceType -> " + str(type.IsReferenceType()) + '\n')
+
def DebugPExpect(self, child):
"""Debug the spwaned pexpect object."""
if not traceAlways:
Added: lldb/trunk/test/python_api/type/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/type/Makefile?rev=136975&view=auto
==============================================================================
--- lldb/trunk/test/python_api/type/Makefile (added)
+++ lldb/trunk/test/python_api/type/Makefile Fri Aug 5 15:17:27 2011
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added: lldb/trunk/test/python_api/type/TestTypeList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/type/TestTypeList.py?rev=136975&view=auto
==============================================================================
--- lldb/trunk/test/python_api/type/TestTypeList.py (added)
+++ lldb/trunk/test/python_api/type/TestTypeList.py Fri Aug 5 15:17:27 2011
@@ -0,0 +1,108 @@
+"""
+Test SBType and SBTypeList API.
+"""
+
+import os, time
+import re
+import unittest2
+import lldb, lldbutil
+from lldbtest import *
+
+class TypeAndTypeListTestCase(TestBase):
+
+ mydir = os.path.join("python_api", "type")
+
+ @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ @python_api_test
+ def test_with_dsym(self):
+ """Exercise SBType and SBTypeList API."""
+ d = {'EXE': self.exe_name}
+ self.buildDsym(dictionary=d)
+ self.setTearDownCleanup(dictionary=d)
+ self.type_and_typelist_api(self.exe_name)
+
+ @python_api_test
+ def test_with_dwarf(self):
+ """Exercise SBType and SBTypeList API."""
+ d = {'EXE': self.exe_name}
+ self.buildDwarf(dictionary=d)
+ self.setTearDownCleanup(dictionary=d)
+ self.type_and_typelist_api(self.exe_name)
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+ # We'll use the test method name as the exe_name.
+ self.exe_name = self.testMethodName
+ # Find the line number to break at.
+ self.source = 'main.cpp'
+ self.line = line_number(self.source, '// Break at this line')
+
+ def type_and_typelist_api(self, exe_name):
+ """Exercise SBType and SBTypeList API."""
+ exe = os.path.join(os.getcwd(), exe_name)
+
+ # Create a target by the debugger.
+ target = self.dbg.CreateTarget(exe)
+ self.assertTrue(target, VALID_TARGET)
+
+ # Create the breakpoint inside function 'main'.
+ breakpoint = target.BreakpointCreateByLocation(self.source, self.line)
+ self.assertTrue(breakpoint, VALID_BREAKPOINT)
+
+ # Now launch the process, and do not stop at entry point.
+ process = target.LaunchSimple(None, None, os.getcwd())
+ self.assertTrue(process, PROCESS_IS_VALID)
+
+ # Get Frame #0.
+ self.assertTrue(process.GetState() == lldb.eStateStopped)
+ thread = lldbutil.get_stopped_thread(process, lldb.eStopReasonBreakpoint)
+ self.assertTrue(thread != None, "There should be a thread stopped due to breakpoint condition")
+ frame0 = thread.GetFrameAtIndex(0)
+
+ # Get the type 'Task'.
+ type_list = target.FindTypes('Task')
+ if self.TraceOn():
+ print "Size of type_list from target.FindTypes('Task') query: %d" % type_list.GetSize()
+ self.assertTrue(len(type_list) == 1)
+ for type in type_list:
+ self.assertTrue(type)
+ self.DebugSBType(type)
+
+ # Now use the SBTarget.FindFirstType() API to find 'Task'.
+ task_type = target.FindFirstType('Task')
+ self.assertTrue(task_type)
+ self.DebugSBType(task_type)
+
+ # Get the reference type of 'Task', just for fun.
+ task_ref_type = task_type.GetReferenceType()
+ self.assertTrue(task_ref_type)
+ self.DebugSBType(task_ref_type)
+
+ # Get the pointer type of 'Task', which is the same as task_head's type.
+ task_pointer_type = task_type.GetPointerType()
+ self.assertTrue(task_pointer_type)
+ self.DebugSBType(task_pointer_type)
+
+ # Get variable 'task_head'.
+ task_head = frame0.FindVariable('task_head')
+ self.assertTrue(task_head, VALID_VARIABLE)
+ self.DebugSBValue(task_head)
+ task_head_type = task_head.GetType()
+ self.DebugSBType(task_head_type)
+ self.assertTrue(task_head_type.IsPointerType())
+
+ self.assertTrue(task_head_type == task_pointer_type)
+
+ # Get the pointee type of 'task_head'.
+ task_head_pointee_type = task_head_type.GetPointeeType()
+ self.DebugSBType(task_head_pointee_type)
+
+ self.assertTrue(task_type == task_head_pointee_type)
+
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
Added: lldb/trunk/test/python_api/type/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/type/main.cpp?rev=136975&view=auto
==============================================================================
--- lldb/trunk/test/python_api/type/main.cpp (added)
+++ lldb/trunk/test/python_api/type/main.cpp Fri Aug 5 15:17:27 2011
@@ -0,0 +1,49 @@
+//===-- main.c --------------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include
+
+class Task {
+public:
+ int id;
+ Task *next;
+ Task(int i, Task *n):
+ id(i),
+ next(n)
+ {}
+};
+
+
+int main (int argc, char const *argv[])
+{
+ Task *task_head = new Task(-1, NULL);
+ Task *task1 = new Task(1, NULL);
+ Task *task2 = new Task(2, NULL);
+ Task *task3 = new Task(3, NULL); // Orphaned.
+ Task *task4 = new Task(4, NULL);
+ Task *task5 = new Task(5, NULL);
+
+ task_head->next = task1;
+ task1->next = task2;
+ task2->next = task4;
+ task4->next = task5;
+
+ int total = 0;
+ Task *t = task_head;
+ while (t != NULL) {
+ if (t->id >= 0)
+ ++total;
+ t = t->next;
+ }
+ printf("We have a total number of %d tasks\n", total);
+
+ // This corresponds to an empty task list.
+ Task *empty_task_head = new Task(-1, NULL);
+
+ return 0; // Break at this line
+}
From johnny.chen at apple.com Fri Aug 5 15:30:56 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 20:30:56 -0000
Subject: [Lldb-commits] [lldb] r136976 -
/lldb/trunk/scripts/Python/interface/SBType.i
Message-ID: <20110805203056.3967D2A6C12C@llvm.org>
Author: johnny
Date: Fri Aug 5 15:30:56 2011
New Revision: 136976
URL: http://llvm.org/viewvc/llvm-project?rev=136976&view=rev
Log:
Fix indentation and remove the private section of SBTypeList.
SWIG doesn't care about the private section of class SBTypeList.
Modified:
lldb/trunk/scripts/Python/interface/SBType.i
Modified: lldb/trunk/scripts/Python/interface/SBType.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBType.i?rev=136976&r1=136975&r2=136976&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBType.i (original)
+++ lldb/trunk/scripts/Python/interface/SBType.i Fri Aug 5 15:30:56 2011
@@ -9,63 +9,59 @@
namespace lldb {
- class SBType
- {
- public:
-
- SBType (const SBType &rhs);
-
- ~SBType ();
-
- bool
- IsValid() const;
-
- size_t
- GetByteSize() const;
-
- bool
- IsPointerType() const;
-
- bool
- IsReferenceType() const;
-
- SBType
- GetPointerType() const;
-
- SBType
- GetPointeeType() const;
-
- SBType
- GetReferenceType() const;
-
- SBType
- GetDereferencedType() const;
-
- SBType
- GetBasicType(lldb::BasicType type) const;
-
- const char*
- GetName();
- };
-
- class SBTypeList
- {
- public:
- SBTypeList();
-
- void
- Append(const SBType& type);
-
- SBType
- GetTypeAtIndex(int index);
-
- int
- GetSize();
-
- ~SBTypeList();
-
- private:
- std::auto_ptr m_content;
- };
+class SBType
+{
+public:
+ SBType (const SBType &rhs);
+
+ ~SBType ();
+
+ bool
+ IsValid() const;
+
+ size_t
+ GetByteSize() const;
+
+ bool
+ IsPointerType() const;
+
+ bool
+ IsReferenceType() const;
+
+ SBType
+ GetPointerType() const;
+
+ SBType
+ GetPointeeType() const;
+
+ SBType
+ GetReferenceType() const;
+
+ SBType
+ GetDereferencedType() const;
+
+ SBType
+ GetBasicType(lldb::BasicType type) const;
+
+ const char*
+ GetName();
+};
+
+class SBTypeList
+{
+public:
+ SBTypeList();
+
+ void
+ Append(const SBType& type);
+
+ SBType
+ GetTypeAtIndex(int index);
+
+ int
+ GetSize();
+
+ ~SBTypeList();
+};
} // namespace lldb
From johnny.chen at apple.com Fri Aug 5 15:48:02 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 20:48:02 -0000
Subject: [Lldb-commits] [lldb] r136979 -
/lldb/trunk/scripts/Python/interface/SBType.i
Message-ID: <20110805204802.568D92A6C12C@llvm.org>
Author: johnny
Date: Fri Aug 5 15:48:02 2011
New Revision: 136979
URL: http://llvm.org/viewvc/llvm-project?rev=136979&view=rev
Log:
Add docstring & example usage for SBTypeList.
Modified:
lldb/trunk/scripts/Python/interface/SBType.i
Modified: lldb/trunk/scripts/Python/interface/SBType.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBType.i?rev=136979&r1=136978&r2=136979&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBType.i (original)
+++ lldb/trunk/scripts/Python/interface/SBType.i Fri Aug 5 15:48:02 2011
@@ -47,6 +47,37 @@
GetName();
};
+%feature("docstring",
+"Represents a list of SBTypes. The FindTypes() method of SBTarget/SBModule
+returns a SBTypeList.
+
+SBTypeList supports SBType iteration. For example,
+
+main.cpp:
+
+class Task {
+public:
+ int id;
+ Task *next;
+ Task(int i, Task *n):
+ id(i),
+ next(n)
+ {}
+};
+
+...
+
+find_type.py:
+
+ # Get the type 'Task'.
+ type_list = target.FindTypes('Task')
+ self.assertTrue(len(type_list) == 1)
+ # To illustrate the SBType iteration.
+ for type in type_list:
+ # do something with type
+
+...
+") SBTypeList;
class SBTypeList
{
public:
From gclayton at apple.com Fri Aug 5 15:48:30 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 05 Aug 2011 20:48:30 -0000
Subject: [Lldb-commits] [lldb] r136980 - in /lldb/trunk:
include/lldb/API/SBType.h source/API/SBType.cpp
source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
source/Symbol/ClangASTContext.cpp
Message-ID: <20110805204830.A70722A6C12C@llvm.org>
Author: gclayton
Date: Fri Aug 5 15:48:30 2011
New Revision: 136980
URL: http://llvm.org/viewvc/llvm-project?rev=136980&view=rev
Log:
Fixed issues for iOS debugging where if a device has
a native architecture that doesn't match the universal
slice that is being used for all executables, we weren't
correctly descending through the platform architectures
and resolving the binaries.
Modified:
lldb/trunk/include/lldb/API/SBType.h
lldb/trunk/source/API/SBType.cpp
lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
lldb/trunk/source/Symbol/ClangASTContext.cpp
Modified: lldb/trunk/include/lldb/API/SBType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBType.h?rev=136980&r1=136979&r2=136980&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBType.h (original)
+++ lldb/trunk/include/lldb/API/SBType.h Fri Aug 5 15:48:30 2011
@@ -71,6 +71,10 @@
const char*
GetName();
+
+ // DEPRECATED: but needed for Xcode right now
+ static bool
+ IsPointerType (void * clang_type);
protected:
lldb::TypeImplSP m_opaque_sp;
Modified: lldb/trunk/source/API/SBType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBType.cpp?rev=136980&r1=136979&r2=136980&view=diff
==============================================================================
--- lldb/trunk/source/API/SBType.cpp (original)
+++ lldb/trunk/source/API/SBType.cpp Fri Aug 5 15:48:30 2011
@@ -356,4 +356,17 @@
SBTypeList::~SBTypeList()
{
-}
\ No newline at end of file
+}
+
+bool
+SBType::IsPointerType (void *opaque_type)
+{
+ LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+ bool ret_value = ClangASTContext::IsPointerType (opaque_type);
+
+ if (log)
+ log->Printf ("SBType::IsPointerType (opaque_type=%p) ==> '%s'", opaque_type, (ret_value ? "true" : "false"));
+
+ return ret_value;
+}
Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=136980&r1=136979&r2=136980&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Fri Aug 5 15:48:30 2011
@@ -929,38 +929,39 @@
if (ReadAllImageInfosStructure ())
{
- if (m_dyld_all_image_infos.dylib_info_count > 0)
+ // Nothing to load or unload?
+ if (m_dyld_all_image_infos.dylib_info_count == 0)
+ return true;
+
+ if (m_dyld_all_image_infos.dylib_info_addr == 0)
{
- if (m_dyld_all_image_infos.dylib_info_addr == 0)
+ // DYLD is updating the images now. So we should say we have no images, and then we'll
+ // figure it out when we hit the added breakpoint.
+ return false;
+ }
+ else
+ {
+ if (!AddModulesUsingImageInfosAddress (m_dyld_all_image_infos.dylib_info_addr,
+ m_dyld_all_image_infos.dylib_info_count))
{
- // DYLD is updating the images now. So we should say we have no images, and then we'll
- // figure it out when we hit the added breakpoint.
- return false;
- }
- else
- {
- if (!AddModulesUsingImageInfosAddress (m_dyld_all_image_infos.dylib_info_addr,
- m_dyld_all_image_infos.dylib_info_count))
- {
- DEBUG_PRINTF( "unable to read all data for all_dylib_infos.");
- m_dyld_image_infos.clear();
- }
+ DEBUG_PRINTF( "unable to read all data for all_dylib_infos.");
+ m_dyld_image_infos.clear();
}
}
-
+
// Now we have one more bit of business. If there is a library left in the images for our target that
// doesn't have a load address, then it must be something that we were expecting to load (for instance we
// read a load command for it) but it didn't in fact load - probably because DYLD_*_PATH pointed
// to an equivalent version. We don't want it to stay in the target's module list or it will confuse
// us, so unload it here.
- Target *target = m_process->CalculateTarget();
- ModuleList &modules = target->GetImages();
+ Target &target = m_process->GetTarget();
+ ModuleList &modules = target.GetImages();
ModuleList not_loaded_modules;
size_t num_modules = modules.GetSize();
- for (size_t i = 0; i < num_modules; i++)
+ for (size_t i = 1; i < num_modules; i++)
{
ModuleSP module_sp = modules.GetModuleAtIndex(i);
- if (!module_sp->IsLoadedInTarget (target))
+ if (!module_sp->IsLoadedInTarget (&target))
{
if (log)
{
@@ -974,9 +975,9 @@
if (not_loaded_modules.GetSize() != 0)
{
- target->ModulesDidUnload(not_loaded_modules);
+ target.ModulesDidUnload(not_loaded_modules);
}
-
+
return true;
}
else
@@ -1182,7 +1183,8 @@
if (exe_idx < image_infos.size())
{
- ModuleSP exe_module_sp (FindTargetModuleForDYLDImageInfo (image_infos[exe_idx], false, NULL));
+ const bool can_create = true;
+ ModuleSP exe_module_sp (FindTargetModuleForDYLDImageInfo (image_infos[exe_idx], can_create, NULL));
if (!exe_module_sp)
{
@@ -1198,7 +1200,7 @@
{
// Don't load dependent images since we are in dyld where we will know
// and find out about all images that are loaded
- bool get_dependent_images = false;
+ const bool get_dependent_images = false;
m_process->GetTarget().SetExecutableModule (exe_module_sp,
get_dependent_images);
}
Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp?rev=136980&r1=136979&r2=136980&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp Fri Aug 5 15:48:30 2011
@@ -441,8 +441,13 @@
error = GetFile (platform_file, uuid_ptr, local_file);
if (error.Success())
{
+
+ error = ResolveExecutable (local_file, arch, module_sp);
+ }
+ else
+ {
const bool always_create = false;
- error = ModuleList::GetSharedModule (local_file,
+ error = ModuleList::GetSharedModule (platform_file,
arch,
uuid_ptr,
object_name_ptr,
@@ -451,6 +456,7 @@
old_module_sp_ptr,
did_create_ptr,
always_create);
+
}
if (module_sp)
module_sp->SetPlatformFileSpec(platform_file);
Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=136980&r1=136979&r2=136980&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Aug 5 15:48:30 2011
@@ -413,12 +413,6 @@
{
Clear();
m_target_triple.assign(target_triple);
- if (m_target_triple.find("armv7s") == 0)
- m_target_triple.erase(5,1);
- else if (m_target_triple.find("armv7f") == 0)
- m_target_triple.erase(5,1);
- else if (m_target_triple.find("armv7k") == 0)
- m_target_triple.erase(5,1);
}
void
From johnny.chen at apple.com Fri Aug 5 16:35:43 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 21:35:43 -0000
Subject: [Lldb-commits] [lldb] r136983 - in /lldb/trunk:
scripts/Python/interface/SBType.i test/python_api/type/TestTypeList.py
Message-ID: <20110805213543.790342A6C12C@llvm.org>
Author: johnny
Date: Fri Aug 5 16:35:43 2011
New Revision: 136983
URL: http://llvm.org/viewvc/llvm-project?rev=136983&view=rev
Log:
Add SBType.GetBasicType() to the test scenario.
Add docstring for SBType, too.
Modified:
lldb/trunk/scripts/Python/interface/SBType.i
lldb/trunk/test/python_api/type/TestTypeList.py
Modified: lldb/trunk/scripts/Python/interface/SBType.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBType.i?rev=136983&r1=136982&r2=136983&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBType.i (original)
+++ lldb/trunk/scripts/Python/interface/SBType.i Fri Aug 5 16:35:43 2011
@@ -9,6 +9,79 @@
namespace lldb {
+%feature("docstring",
+"Represents a data type in lldb. The FindFirstType() method of SBTarget/SBModule
+returns a SBType.
+
+SBType supports the eq/ne operator. For example,
+
+main.cpp:
+
+class Task {
+public:
+ int id;
+ Task *next;
+ Task(int i, Task *n):
+ id(i),
+ next(n)
+ {}
+};
+
+int main (int argc, char const *argv[])
+{
+ Task *task_head = new Task(-1, NULL);
+ Task *task1 = new Task(1, NULL);
+ Task *task2 = new Task(2, NULL);
+ Task *task3 = new Task(3, NULL); // Orphaned.
+ Task *task4 = new Task(4, NULL);
+ Task *task5 = new Task(5, NULL);
+
+ task_head->next = task1;
+ task1->next = task2;
+ task2->next = task4;
+ task4->next = task5;
+
+ int total = 0;
+ Task *t = task_head;
+ while (t != NULL) {
+ if (t->id >= 0)
+ ++total;
+ t = t->next;
+ }
+ printf('We have a total number of %d tasks\n', total);
+
+ // This corresponds to an empty task list.
+ Task *empty_task_head = new Task(-1, NULL);
+
+ return 0; // Break at this line
+}
+
+find_type.py:
+
+ # Get the type 'Task'.
+ task_type = target.FindFirstType('Task')
+ self.assertTrue(task_type)
+
+ # Get the variable 'task_head'.
+ frame0.FindVariable('task_head')
+ task_head_type = task_head.GetType()
+ self.assertTrue(task_head_type.IsPointerType())
+
+ # task_head_type is 'Task *'.
+ task_pointer_type = task_type.GetPointerType()
+ self.assertTrue(task_head_type == task_pointer_type)
+
+ # Get the child mmember 'id' from 'task_head'.
+ id = task_head.GetChildMemberWithName('id')
+ id_type = id.GetType()
+
+ # SBType.GetBasicType() takes an enum 'BasicType' (lldb-enumerations.h).
+ int_type = id_type.GetBasicType(lldb.eBasicTypeInt)
+ # id_type and int_type should be the same type!
+ self.assertTrue(id_type == int_type)
+
+...
+") SBType;
class SBType
{
public:
Modified: lldb/trunk/test/python_api/type/TestTypeList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/type/TestTypeList.py?rev=136983&r1=136982&r2=136983&view=diff
==============================================================================
--- lldb/trunk/test/python_api/type/TestTypeList.py (original)
+++ lldb/trunk/test/python_api/type/TestTypeList.py Fri Aug 5 16:35:43 2011
@@ -100,6 +100,15 @@
self.assertTrue(task_type == task_head_pointee_type)
+ # We'll now get the child member 'id' from 'task_head'.
+ id = task_head.GetChildMemberWithName('id')
+ self.DebugSBValue(id)
+ id_type = id.GetType()
+ self.DebugSBType(id_type)
+
+ # SBType.GetBasicType() takes an enum 'BasicType' (lldb-enumerations.h).
+ int_type = id_type.GetBasicType(lldb.eBasicTypeInt)
+ self.assertTrue(id_type == int_type)
if __name__ == '__main__':
import atexit
From johnny.chen at apple.com Fri Aug 5 16:55:15 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 21:55:15 -0000
Subject: [Lldb-commits] [lldb] r136985 -
/lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
Message-ID: <20110805215515.D83BB2A6C12C@llvm.org>
Author: johnny
Date: Fri Aug 5 16:55:15 2011
New Revision: 136985
URL: http://llvm.org/viewvc/llvm-project?rev=136985&view=rev
Log:
Fixed test suite failure of test_SBTypeList().
SBTypeList does not have IsValid() method defined. It's always valid in a sense.
So the Python's truth value testing in turn delegates to __len__() method, which
is defined for SBTypeList, and returns 0.
Modified:
lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
Modified: lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py?rev=136985&r1=136984&r2=136985&view=diff
==============================================================================
--- lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py (original)
+++ lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py Fri Aug 5 16:55:15 2011
@@ -316,7 +316,10 @@
obj = lldb.SBTypeList()
if self.TraceOn():
print obj
- self.assertTrue(obj)
+ # SBTypeList does not have IsValid() method defined. It's always valid
+ # in a sense. So the Python's truth value testing in turn delegates to
+ # __len__() method, which is defined for SBTypeList, and returns 0.
+ self.assertFalse(obj)
@python_api_test
def test_SBValue(self):
From johnny.chen at apple.com Fri Aug 5 17:23:26 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 05 Aug 2011 22:23:26 -0000
Subject: [Lldb-commits] [lldb] r136990 - in /lldb/trunk:
include/lldb/API/SBType.h scripts/Python/interface/SBType.i
source/API/SBType.cpp
test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
Message-ID: <20110805222326.40AEC2A6C12C@llvm.org>
Author: johnny
Date: Fri Aug 5 17:23:26 2011
New Revision: 136990
URL: http://llvm.org/viewvc/llvm-project?rev=136990&view=rev
Log:
On second thought, add the IsValid() method to SBTypeList, making it similar to SBSymbolContextList and SBValueList.
Modify the test suite accordingly.
Modified:
lldb/trunk/include/lldb/API/SBType.h
lldb/trunk/scripts/Python/interface/SBType.i
lldb/trunk/source/API/SBType.cpp
lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
Modified: lldb/trunk/include/lldb/API/SBType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBType.h?rev=136990&r1=136989&r2=136990&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBType.h (original)
+++ lldb/trunk/include/lldb/API/SBType.h Fri Aug 5 17:23:26 2011
@@ -101,6 +101,9 @@
SBTypeList&
operator = (const SBTypeList& rhs);
+ bool
+ IsValid() const;
+
void
Append (const SBType& type);
Modified: lldb/trunk/scripts/Python/interface/SBType.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBType.i?rev=136990&r1=136989&r2=136990&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBType.i (original)
+++ lldb/trunk/scripts/Python/interface/SBType.i Fri Aug 5 17:23:26 2011
@@ -156,6 +156,9 @@
public:
SBTypeList();
+ bool
+ IsValid() const;
+
void
Append(const SBType& type);
Modified: lldb/trunk/source/API/SBType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBType.cpp?rev=136990&r1=136989&r2=136990&view=diff
==============================================================================
--- lldb/trunk/source/API/SBType.cpp (original)
+++ lldb/trunk/source/API/SBType.cpp Fri Aug 5 17:23:26 2011
@@ -323,6 +323,12 @@
Append(rhs.GetTypeAtIndex(i));
}
+bool
+SBTypeList::IsValid () const
+{
+ return (m_opaque_ap.get() != NULL);
+}
+
SBTypeList&
SBTypeList::operator = (const SBTypeList& rhs)
{
Modified: lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py?rev=136990&r1=136989&r2=136990&view=diff
==============================================================================
--- lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py (original)
+++ lldb/trunk/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py Fri Aug 5 17:23:26 2011
@@ -313,13 +313,11 @@
@python_api_test
def test_SBTypeList(self):
+ """SBTypeList object is valid after default construction."""
obj = lldb.SBTypeList()
if self.TraceOn():
print obj
- # SBTypeList does not have IsValid() method defined. It's always valid
- # in a sense. So the Python's truth value testing in turn delegates to
- # __len__() method, which is defined for SBTypeList, and returns 0.
- self.assertFalse(obj)
+ self.assertTrue(obj)
@python_api_test
def test_SBValue(self):
From scallanan at apple.com Fri Aug 5 18:43:37 2011
From: scallanan at apple.com (Sean Callanan)
Date: Fri, 05 Aug 2011 23:43:37 -0000
Subject: [Lldb-commits] [lldb] r136999 - in /lldb/trunk:
include/lldb/Symbol/ source/Expression/ source/Plugins/SymbolFile/DWARF/
source/Symbol/ test/lang/cpp/this/ test/lang/objc/self/
Message-ID: <20110805234337.B8B3D2A6C12C@llvm.org>
Author: spyffe
Date: Fri Aug 5 18:43:37 2011
New Revision: 136999
URL: http://llvm.org/viewvc/llvm-project?rev=136999&view=rev
Log:
This is an overhaul of the expression parser code
that detects what context the current expression is
meant to execute in. LLDB now properly consults
the method declaration in the debug information
rather than trying to hunt down the "this" or "self"
pointer by name, which can be misleading.
Other fixes include:
- LLDB now properly detects that it is inside
an inlined C++ member function.
- LLDB now allows access to non-const members when
in const code.
- The functions in SymbolFile that locate the
DeclContext containing a DIE have been renamed
to reflect what they actually do. I have added
new functions that find the DeclContext for the
DIE itself.
I have also introduced testcases for C++ and
Objective-C.
Added:
lldb/trunk/test/lang/cpp/this/
lldb/trunk/test/lang/cpp/this/Makefile
lldb/trunk/test/lang/cpp/this/TestCPPThis.py
lldb/trunk/test/lang/cpp/this/main.cpp
lldb/trunk/test/lang/objc/self/
lldb/trunk/test/lang/objc/self/Makefile
lldb/trunk/test/lang/objc/self/TestObjCSelf.py
lldb/trunk/test/lang/objc/self/main.m
Modified:
lldb/trunk/include/lldb/Symbol/Block.h
lldb/trunk/include/lldb/Symbol/Function.h
lldb/trunk/include/lldb/Symbol/SymbolFile.h
lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
lldb/trunk/source/Expression/ClangUserExpression.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
lldb/trunk/source/Symbol/Block.cpp
lldb/trunk/source/Symbol/Function.cpp
lldb/trunk/source/Symbol/Type.cpp
Modified: lldb/trunk/include/lldb/Symbol/Block.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Block.h?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Block.h (original)
+++ lldb/trunk/include/lldb/Symbol/Block.h Fri Aug 5 18:43:37 2011
@@ -336,6 +336,9 @@
{
return m_inlineInfoSP.get();
}
+
+ clang::DeclContext *
+ GetClangDeclContextForInlinedFunction();
//------------------------------------------------------------------
/// Get the memory cost of this object.
Modified: lldb/trunk/include/lldb/Symbol/Function.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Function.h?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Function.h (original)
+++ lldb/trunk/include/lldb/Symbol/Function.h Fri Aug 5 18:43:37 2011
@@ -10,6 +10,7 @@
#ifndef liblldb_Function_h_
#define liblldb_Function_h_
+#include "lldb/Core/ClangForward.h"
#include "lldb/Core/AddressRange.h"
#include "lldb/Symbol/Block.h"
#include "lldb/Symbol/Declaration.h"
@@ -527,6 +528,15 @@
}
//------------------------------------------------------------------
+ /// Get the DeclContext for this function, if available.
+ ///
+ /// @return
+ /// The DeclContext, or NULL if none exists.
+ //------------------------------------------------------------------
+ clang::DeclContext *
+ GetClangDeclContext();
+
+ //------------------------------------------------------------------
/// Get accessor for the type that describes the function
/// return value type, and paramter types.
///
Modified: lldb/trunk/include/lldb/Symbol/SymbolFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolFile.h?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/SymbolFile.h (original)
+++ lldb/trunk/include/lldb/Symbol/SymbolFile.h Fri Aug 5 18:43:37 2011
@@ -113,7 +113,8 @@
virtual size_t ParseVariablesForContext (const SymbolContext& sc) = 0;
virtual Type* ResolveTypeUID (lldb::user_id_t type_uid) = 0;
virtual lldb::clang_type_t ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_type) = 0;
- virtual clang::DeclContext* GetClangDeclContextForTypeUID (lldb::user_id_t type_uid) { return NULL; }
+ virtual clang::DeclContext* GetClangDeclContextForTypeUID (const lldb_private::SymbolContext &sc, lldb::user_id_t type_uid) { return NULL; }
+ virtual clang::DeclContext* GetClangDeclContextContainingTypeUID (lldb::user_id_t type_uid) { return NULL; }
virtual uint32_t ResolveSymbolContext (const Address& so_addr, uint32_t resolve_scope, SymbolContext& sc) = 0;
virtual uint32_t ResolveSymbolContext (const FileSpec& file_spec, uint32_t line, bool check_inlines, uint32_t resolve_scope, SymbolContextList& sc_list) = 0;
virtual uint32_t FindGlobalVariables (const ConstString &name, bool append, uint32_t max_matches, VariableList& variables) = 0;
Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Aug 5 18:43:37 2011
@@ -1874,7 +1874,12 @@
&pointer_target_type))
return;
- TypeFromUser class_user_type(pointer_target_type,
+ clang::QualType pointer_target_qual_type = QualType::getFromOpaquePtr(pointer_target_type);
+
+ if (pointer_target_qual_type.isConstQualified())
+ pointer_target_qual_type.removeLocalConst();
+
+ TypeFromUser class_user_type(pointer_target_qual_type.getAsOpaquePtr(),
this_type->GetClangAST());
if (log)
Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Fri Aug 5 18:43:37 2011
@@ -37,6 +37,9 @@
#include "lldb/Target/ThreadPlan.h"
#include "lldb/Target/ThreadPlanCallUserExpression.h"
+#include "clang/AST/DeclCXX.h"
+#include "clang/AST/DeclObjC.h"
+
using namespace lldb_private;
ClangUserExpression::ClangUserExpression (const char *expr,
@@ -68,44 +71,46 @@
void
ClangUserExpression::ScanContext(ExecutionContext &exe_ctx)
{
- VariableList *vars = exe_ctx.frame->GetVariableList(false);
+ if (!exe_ctx.frame)
+ return;
+
+ SymbolContext sym_ctx = exe_ctx.frame->GetSymbolContext(lldb::eSymbolContextFunction);
- if (!vars)
+ if (!sym_ctx.function)
return;
- lldb::VariableSP this_var(vars->FindVariable(ConstString("this")));
- lldb::VariableSP self_var(vars->FindVariable(ConstString("self")));
+ clang::DeclContext *decl_context;
- if (this_var.get())
- {
- Type *this_type = this_var->GetType();
+ if (sym_ctx.block && sym_ctx.block->GetInlinedFunctionInfo())
+ decl_context = sym_ctx.block->GetClangDeclContextForInlinedFunction();
+ else
+ decl_context = sym_ctx.function->GetClangDeclContext();
- lldb::clang_type_t pointer_target_type;
+ if (!decl_context)
+ return;
- if (ClangASTContext::IsPointerType(this_type->GetClangForwardType(),
- &pointer_target_type))
+ if (clang::CXXMethodDecl *method_decl = llvm::dyn_cast(decl_context))
+ {
+ if (method_decl->isInstance())
{
- TypeFromUser target_ast_type(pointer_target_type, this_type->GetClangAST());
-
- if (ClangASTContext::IsCXXClassType(target_ast_type.GetOpaqueQualType()))
- {
- m_cplusplus = true;
+ m_cplusplus = true;
- if (target_ast_type.IsConst())
- m_const_object = true;
- }
+ do {
+ clang::QualType this_type = method_decl->getThisType(decl_context->getParentASTContext());
+
+ const clang::PointerType *this_pointer_type = llvm::dyn_cast(this_type.getTypePtr());
+
+ if (!this_pointer_type)
+ break;
+
+ clang::QualType this_pointee_type = this_pointer_type->getPointeeType();
+ } while (0);
}
}
- else if (self_var.get())
+ else if (clang::ObjCMethodDecl *method_decl = llvm::dyn_cast(decl_context))
{
- m_objectivec = true;
-
- Type *self_type = self_var->GetType();
-
- if (self_type->GetClangForwardType() == self_type->GetClangASTContext().GetBuiltInType_objc_id())
- {
- m_objectivec = false;
- }
+ if (method_decl->isInstanceMethod())
+ m_objectivec = true;
}
}
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Fri Aug 5 18:43:37 2011
@@ -1355,7 +1355,7 @@
clang::DeclContext*
-SymbolFileDWARF::GetClangDeclContextForTypeUID (lldb::user_id_t type_uid)
+SymbolFileDWARF::GetClangDeclContextContainingTypeUID (lldb::user_id_t type_uid)
{
DWARFDebugInfo* debug_info = DebugInfo();
if (debug_info)
@@ -1363,7 +1363,21 @@
DWARFCompileUnitSP cu_sp;
const DWARFDebugInfoEntry* die = debug_info->GetDIEPtr(type_uid, &cu_sp);
if (die)
- return GetClangDeclContextForDIE (cu_sp.get(), die);
+ return GetClangDeclContextContainingDIE (cu_sp.get(), die);
+ }
+ return NULL;
+}
+
+clang::DeclContext*
+SymbolFileDWARF::GetClangDeclContextForTypeUID (const lldb_private::SymbolContext &sc, lldb::user_id_t type_uid)
+{
+ DWARFDebugInfo* debug_info = DebugInfo();
+ if (debug_info)
+ {
+ DWARFCompileUnitSP cu_sp;
+ const DWARFDebugInfoEntry* die = debug_info->GetDIEPtr(type_uid, &cu_sp);
+ if (die)
+ return GetClangDeclContextForDIE (sc, cu_sp.get(), die);
}
return NULL;
}
@@ -2799,17 +2813,28 @@
}
clang::DeclContext *
-SymbolFileDWARF::GetClangDeclContextForDIEOffset (dw_offset_t die_offset)
+SymbolFileDWARF::GetClangDeclContextContainingDIEOffset (dw_offset_t die_offset)
{
if (die_offset != DW_INVALID_OFFSET)
{
DWARFCompileUnitSP cu_sp;
const DWARFDebugInfoEntry* die = DebugInfo()->GetDIEPtr(die_offset, &cu_sp);
- return GetClangDeclContextForDIE (cu_sp.get(), die);
+ return GetClangDeclContextContainingDIE (cu_sp.get(), die);
}
return NULL;
}
+clang::DeclContext *
+SymbolFileDWARF::GetClangDeclContextForDIEOffset (const SymbolContext &sc, dw_offset_t die_offset)
+{
+ if (die_offset != DW_INVALID_OFFSET)
+ {
+ DWARFCompileUnitSP cu_sp;
+ const DWARFDebugInfoEntry* die = DebugInfo()->GetDIEPtr(die_offset, &cu_sp);
+ return GetClangDeclContextForDIE (sc, cu_sp.get(), die);
+ }
+ return NULL;
+}
clang::NamespaceDecl *
SymbolFileDWARF::ResolveNamespaceDIE (DWARFCompileUnit *curr_cu, const DWARFDebugInfoEntry *die)
@@ -2820,7 +2845,7 @@
if (namespace_name)
{
Declaration decl; // TODO: fill in the decl object
- clang::NamespaceDecl *namespace_decl = GetClangASTContext().GetUniqueNamespaceDeclaration (namespace_name, decl, GetClangDeclContextForDIE (curr_cu, die->GetParent()));
+ clang::NamespaceDecl *namespace_decl = GetClangASTContext().GetUniqueNamespaceDeclaration (namespace_name, decl, GetClangDeclContextContainingDIE (curr_cu, die->GetParent()));
if (namespace_decl)
LinkDeclContextToDIE((clang::DeclContext*)namespace_decl, die);
return namespace_decl;
@@ -2830,12 +2855,36 @@
}
clang::DeclContext *
-SymbolFileDWARF::GetClangDeclContextForDIE (DWARFCompileUnit *curr_cu, const DWARFDebugInfoEntry *die)
+SymbolFileDWARF::GetClangDeclContextForDIE (const SymbolContext &sc, DWARFCompileUnit *curr_cu, const DWARFDebugInfoEntry *die)
+{
+ // If this DIE has a specification, or an abstract origin, then trace to those.
+
+ dw_offset_t die_offset = die->GetAttributeValueAsReference(this, curr_cu, DW_AT_specification, DW_INVALID_OFFSET);
+ if (die_offset != DW_INVALID_OFFSET)
+ return GetClangDeclContextForDIEOffset (sc, die_offset);
+
+ die_offset = die->GetAttributeValueAsReference(this, curr_cu, DW_AT_abstract_origin, DW_INVALID_OFFSET);
+ if (die_offset != DW_INVALID_OFFSET)
+ return GetClangDeclContextForDIEOffset (sc, die_offset);
+
+ // This is the DIE we want. Parse it, then query our map.
+
+ ParseType(sc, curr_cu, die, NULL);
+
+ DIEToDeclContextMap::iterator pos = m_die_to_decl_ctx.find(die);
+ if (pos != m_die_to_decl_ctx.end())
+ return pos->second;
+ else
+ return NULL;
+}
+
+clang::DeclContext *
+SymbolFileDWARF::GetClangDeclContextContainingDIE (DWARFCompileUnit *curr_cu, const DWARFDebugInfoEntry *die)
{
if (m_clang_tu_decl == NULL)
m_clang_tu_decl = GetClangASTContext().getASTContext()->getTranslationUnitDecl();
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x )\n", die->GetOffset());
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x )\n", die->GetOffset());
const DWARFDebugInfoEntry * const decl_die = die;
clang::DeclContext *decl_ctx = NULL;
@@ -2849,11 +2898,11 @@
DIEToDeclContextMap::iterator pos = m_die_to_decl_ctx.find(die);
if (pos != m_die_to_decl_ctx.end())
{
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
return pos->second;
}
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) checking parent 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) checking parent 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
switch (die->Tag())
{
@@ -2863,10 +2912,10 @@
if (namespace_name)
{
Declaration decl; // TODO: fill in the decl object
- clang::NamespaceDecl *namespace_decl = GetClangASTContext().GetUniqueNamespaceDeclaration (namespace_name, decl, GetClangDeclContextForDIE (curr_cu, die));
+ clang::NamespaceDecl *namespace_decl = GetClangASTContext().GetUniqueNamespaceDeclaration (namespace_name, decl, GetClangDeclContextContainingDIE (curr_cu, die));
if (namespace_decl)
{
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
LinkDeclContextToDIE((clang::DeclContext*)namespace_decl, die);
}
return namespace_decl;
@@ -2882,7 +2931,7 @@
pos = m_die_to_decl_ctx.find(die);
if (pos != m_die_to_decl_ctx.end())
{
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), die->GetOffset());
return pos->second;
}
else
@@ -2905,8 +2954,8 @@
dw_offset_t die_offset = die->GetAttributeValueAsReference(this, curr_cu, DW_AT_specification, DW_INVALID_OFFSET);
if (die_offset != DW_INVALID_OFFSET)
{
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) check DW_AT_specification 0x%8.8x\n", decl_die->GetOffset(), die_offset);
- decl_ctx = GetClangDeclContextForDIEOffset (die_offset);
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) check DW_AT_specification 0x%8.8x\n", decl_die->GetOffset(), die_offset);
+ decl_ctx = GetClangDeclContextContainingDIEOffset (die_offset);
if (decl_ctx != m_clang_tu_decl)
return decl_ctx;
}
@@ -2914,8 +2963,8 @@
die_offset = die->GetAttributeValueAsReference(this, curr_cu, DW_AT_abstract_origin, DW_INVALID_OFFSET);
if (die_offset != DW_INVALID_OFFSET)
{
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) check DW_AT_abstract_origin 0x%8.8x\n", decl_die->GetOffset(), die_offset);
- decl_ctx = GetClangDeclContextForDIEOffset (die_offset);
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) check DW_AT_abstract_origin 0x%8.8x\n", decl_die->GetOffset(), die_offset);
+ decl_ctx = GetClangDeclContextContainingDIEOffset (die_offset);
if (decl_ctx != m_clang_tu_decl)
return decl_ctx;
}
@@ -2923,7 +2972,7 @@
die = die->GetParent();
}
// Right now we have only one translation unit per module...
- //printf ("SymbolFileDWARF::GetClangDeclContextForDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), curr_cu->GetFirstDIEOffset());
+ //printf ("SymbolFileDWARF::GetClangDeclContextContainingDIE ( die = 0x%8.8x ) => 0x%8.8x\n", decl_die->GetOffset(), curr_cu->GetFirstDIEOffset());
return m_clang_tu_decl;
}
@@ -3309,7 +3358,7 @@
clang_type_was_created = true;
clang_type = ast.CreateRecordType (type_name_cstr,
tag_decl_kind,
- GetClangDeclContextForDIE (dwarf_cu, die),
+ GetClangDeclContextContainingDIE (dwarf_cu, die),
class_language);
}
@@ -3417,7 +3466,7 @@
DW_ATE_signed,
byte_size * 8);
clang_type = ast.CreateEnumerationType (type_name_cstr,
- GetClangDeclContextForDIE (dwarf_cu, die),
+ GetClangDeclContextContainingDIE (dwarf_cu, die),
decl,
enumerator_clang_type);
}
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Fri Aug 5 18:43:37 2011
@@ -101,7 +101,8 @@
virtual lldb::clang_type_t ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_opaque_type);
virtual lldb_private::Type* ResolveType (DWARFCompileUnit* cu, const DWARFDebugInfoEntry* type_die, bool assert_not_being_parsed = true);
- virtual clang::DeclContext* GetClangDeclContextForTypeUID (lldb::user_id_t type_uid);
+ virtual clang::DeclContext* GetClangDeclContextContainingTypeUID (lldb::user_id_t type_uid);
+ virtual clang::DeclContext* GetClangDeclContextForTypeUID (const lldb_private::SymbolContext &sc, lldb::user_id_t type_uid);
virtual uint32_t ResolveSymbolContext (const lldb_private::Address& so_addr, uint32_t resolve_scope, lldb_private::SymbolContext& sc);
virtual uint32_t ResolveSymbolContext (const lldb_private::FileSpec& file_spec, uint32_t line, bool check_inlines, uint32_t resolve_scope, lldb_private::SymbolContextList& sc_list);
@@ -183,10 +184,16 @@
SupportedVersion(uint16_t version);
clang::DeclContext *
- GetClangDeclContextForDIE (DWARFCompileUnit *cu, const DWARFDebugInfoEntry *die);
+ GetClangDeclContextForDIE (const lldb_private::SymbolContext &sc, DWARFCompileUnit *cu, const DWARFDebugInfoEntry *die);
+
+ clang::DeclContext *
+ GetClangDeclContextForDIEOffset (const lldb_private::SymbolContext &sc, dw_offset_t die_offset);
+
+ clang::DeclContext *
+ GetClangDeclContextContainingDIE (DWARFCompileUnit *cu, const DWARFDebugInfoEntry *die);
clang::DeclContext *
- GetClangDeclContextForDIEOffset (dw_offset_t die_offset);
+ GetClangDeclContextContainingDIEOffset (dw_offset_t die_offset);
void
SearchDeclContext (const clang::DeclContext *decl_context,
Modified: lldb/trunk/source/Symbol/Block.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Block.cpp?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Block.cpp (original)
+++ lldb/trunk/source/Symbol/Block.cpp Fri Aug 5 18:43:37 2011
@@ -11,6 +11,7 @@
#include "lldb/Symbol/Function.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/Section.h"
+#include "lldb/Symbol/SymbolFile.h"
#include "lldb/Symbol/SymbolVendor.h"
#include "lldb/Symbol/VariableList.h"
@@ -535,6 +536,29 @@
return num_variables_added;
}
+clang::DeclContext *
+Block::GetClangDeclContextForInlinedFunction()
+{
+ SymbolContext sc;
+
+ CalculateSymbolContext (&sc);
+
+ if (!sc.module_sp)
+ return NULL;
+
+ SymbolVendor *sym_vendor = sc.module_sp->GetSymbolVendor();
+
+ if (!sym_vendor)
+ return NULL;
+
+ SymbolFile *sym_file = sym_vendor->GetSymbolFile();
+
+ if (!sym_file)
+ return NULL;
+
+ return sym_file->GetClangDeclContextForTypeUID (sc, m_uid);
+}
+
void
Block::SetBlockInfoHasBeenParsed (bool b, bool set_children)
{
Modified: lldb/trunk/source/Symbol/Function.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Function.cpp?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Function.cpp (original)
+++ lldb/trunk/source/Symbol/Function.cpp Fri Aug 5 18:43:37 2011
@@ -14,6 +14,7 @@
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/LineTable.h"
+#include "lldb/Symbol/SymbolFile.h"
#include "lldb/Symbol/SymbolVendor.h"
#include "clang/AST/Type.h"
#include "clang/AST/CanonicalType.h"
@@ -399,6 +400,29 @@
return mem_size;
}
+clang::DeclContext *
+Function::GetClangDeclContext()
+{
+ SymbolContext sc;
+
+ CalculateSymbolContext (&sc);
+
+ if (!sc.module_sp)
+ return NULL;
+
+ SymbolVendor *sym_vendor = sc.module_sp->GetSymbolVendor();
+
+ if (!sym_vendor)
+ return NULL;
+
+ SymbolFile *sym_file = sym_vendor->GetSymbolFile();
+
+ if (!sym_file)
+ return NULL;
+
+ return sym_file->GetClangDeclContextForTypeUID (sc, m_uid);
+}
+
Type*
Function::GetType()
{
Modified: lldb/trunk/source/Symbol/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=136999&r1=136998&r2=136999&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Type.cpp (original)
+++ lldb/trunk/source/Symbol/Type.cpp Fri Aug 5 18:43:37 2011
@@ -640,7 +640,7 @@
assert(typedef_type && base_type);
return GetClangASTContext().CreateTypedefType (typedef_type->GetName().AsCString(),
base_type->GetClangForwardType(),
- typedef_type->GetSymbolFile()->GetClangDeclContextForTypeUID(typedef_type->GetID()));
+ typedef_type->GetSymbolFile()->GetClangDeclContextContainingTypeUID(typedef_type->GetID()));
}
void *
Added: lldb/trunk/test/lang/cpp/this/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/this/Makefile?rev=136999&view=auto
==============================================================================
--- lldb/trunk/test/lang/cpp/this/Makefile (added)
+++ lldb/trunk/test/lang/cpp/this/Makefile Fri Aug 5 18:43:37 2011
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added: lldb/trunk/test/lang/cpp/this/TestCPPThis.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/this/TestCPPThis.py?rev=136999&view=auto
==============================================================================
--- lldb/trunk/test/lang/cpp/this/TestCPPThis.py (added)
+++ lldb/trunk/test/lang/cpp/this/TestCPPThis.py Fri Aug 5 18:43:37 2011
@@ -0,0 +1,67 @@
+"""
+Tests that C++ member and static variables are available where they should be.
+"""
+
+from lldbtest import *
+
+class CPPThisTestCase(TestBase):
+
+ mydir = os.path.join("lang", "cpp", "this")
+
+ @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ def test_with_dsym_and_run_command(self):
+ """Test that the appropriate member variables are available when stopped in C++ static, inline, and const methods"""
+ self.buildDsym()
+ self.static_method_commands()
+
+ def test_with_dwarf_and_run_command(self):
+ """Test that the appropriate member variables are available when stopped in C++ static, inline, and const methods"""
+ self.buildDwarf()
+ self.static_method_commands()
+
+ def setUp(self):
+ TestBase.setUp(self)
+
+ def set_breakpoint(self, line):
+ self.expect("breakpoint set -f main.cpp -l %d" % line,
+ BREAKPOINT_CREATED,
+ startstr = "Breakpoint created")
+
+ def static_method_commands(self):
+ """Test that the appropriate member variables are available when stopped in C++ static, inline, and const methods"""
+ self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+
+ self.set_breakpoint(line_number('main.cpp', '// breakpoint 1'))
+ self.set_breakpoint(line_number('main.cpp', '// breakpoint 2'))
+ self.set_breakpoint(line_number('main.cpp', '// breakpoint 3'))
+ self.set_breakpoint(line_number('main.cpp', '// breakpoint 4'))
+
+ self.runCmd("process launch", RUN_SUCCEEDED)
+
+ self.expect("expression -- m_a = 2",
+ startstr = "(int) $0 = 2")
+
+ self.runCmd("process continue")
+
+ # This would be disallowed if we enforced const. But we don't.
+ self.expect("expression -- m_a = 2",
+ startstr = "(int) $1 = 2")
+
+ self.expect("expression -- m_a",
+ startstr = "(int) $2 = 2")
+
+ self.runCmd("process continue")
+
+ self.expect("expression -- s_a",
+ startstr = "(int) $3 = 5")
+
+ self.runCmd("process continue")
+
+ self.expect("expression -- m_a",
+ startstr = "(int) $4 = 2")
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
Added: lldb/trunk/test/lang/cpp/this/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/this/main.cpp?rev=136999&view=auto
==============================================================================
--- lldb/trunk/test/lang/cpp/this/main.cpp (added)
+++ lldb/trunk/test/lang/cpp/this/main.cpp Fri Aug 5 18:43:37 2011
@@ -0,0 +1,53 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include
+
+class A
+{
+public:
+ void accessMember(int a);
+ int accessMemberConst() const;
+ static int accessStaticMember();
+
+ int accessMemberInline(int a) __attribute__ ((always_inline))
+ {
+ m_a = a; // breakpoint 4
+ }
+
+ int m_a;
+ static int s_a;
+};
+
+int A::s_a = 5;
+
+void A::accessMember(int a)
+{
+ m_a = a; // breakpoint 1
+}
+
+int A::accessMemberConst() const
+{
+ return m_a; // breakpoint 2
+}
+
+int A::accessStaticMember()
+{
+ return s_a; // breakpoint 3
+}
+
+int main()
+{
+ A my_a;
+
+ my_a.accessMember(3);
+ my_a.accessMemberConst();
+ A::accessStaticMember();
+ my_a.accessMemberInline(5);
+}
Added: lldb/trunk/test/lang/objc/self/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/self/Makefile?rev=136999&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/self/Makefile (added)
+++ lldb/trunk/test/lang/objc/self/Makefile Fri Aug 5 18:43:37 2011
@@ -0,0 +1,6 @@
+LEVEL = ../../../make
+
+OBJC_SOURCES := main.m
+LDFLAGS := $(CFLAGS) -lobjc -framework Foundation
+
+include $(LEVEL)/Makefile.rules
Added: lldb/trunk/test/lang/objc/self/TestObjCSelf.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/self/TestObjCSelf.py?rev=136999&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/self/TestObjCSelf.py (added)
+++ lldb/trunk/test/lang/objc/self/TestObjCSelf.py Fri Aug 5 18:43:37 2011
@@ -0,0 +1,55 @@
+"""
+Tests that ObjC member variables are available where they should be.
+"""
+
+from lldbtest import *
+
+class ObjCSelfTestCase(TestBase):
+
+ mydir = os.path.join("lang", "objc", "self")
+
+ @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ def test_with_dsym_and_run_command(self):
+ """Test that the appropriate member variables are available when stopped in Objective-C class and instance methods"""
+ self.buildDsym()
+ self.self_commands()
+
+ def test_with_dwarf_and_run_command(self):
+ """Test that the appropriate member variables are available when stopped in Objective-C class and instance methods"""
+ self.buildDwarf()
+ self.self_commands()
+
+ def setUp(self):
+ TestBase.setUp(self)
+
+ def set_breakpoint(self, line):
+ self.expect("breakpoint set -f main.m -l %d" % line,
+ BREAKPOINT_CREATED,
+ startstr = "Breakpoint created")
+
+ def self_commands(self):
+ """Test that the appropriate member variables are available when stopped in Objective-C class and instance methods"""
+ self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+
+ self.set_breakpoint(line_number('main.m', '// breakpoint 1'))
+ self.set_breakpoint(line_number('main.m', '// breakpoint 2'))
+
+ self.runCmd("process launch", RUN_SUCCEEDED)
+
+ self.expect("expression -- m_a = 2",
+ startstr = "(int) $0 = 2")
+
+ self.runCmd("process continue")
+
+ # This would be disallowed if we enforced const. But we don't.
+ self.expect("expression -- m_a = 2",
+ error=True)
+
+ self.expect("expression -- s_a",
+ startstr = "(int) $1 = 5")
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
Added: lldb/trunk/test/lang/objc/self/main.m
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/self/main.m?rev=136999&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/self/main.m (added)
+++ lldb/trunk/test/lang/objc/self/main.m Fri Aug 5 18:43:37 2011
@@ -0,0 +1,52 @@
+//===-- main.m ------------------------------------------*- Objective-C -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#import
+
+ at interface A : NSObject
+{
+ int m_a;
+}
+-(id)init;
+-(void)accessMember:(int)a;
++(int)accessStaticMember:(int)a;
+ at end
+
+static int s_a = 5;
+
+ at implementation A
+-(id)init
+{
+ self = [super init];
+
+ if (self)
+ m_a = 2;
+}
+
+-(void)accessMember:(int)a
+{
+ m_a = a; // breakpoint 1
+}
+
++(int)accessStaticMember:(int)a
+{
+ s_a = a; // breakpoint 2
+}
+ at end
+
+int main()
+{
+ NSAutoreleasePool *pool = [NSAutoreleasePool alloc];
+ A *my_a = [[A alloc] init];
+
+ [my_a accessMember:3];
+ [A accessStaticMember:5];
+
+ [pool release];
+}
\ No newline at end of file
From scallanan at apple.com Fri Aug 5 19:28:14 2011
From: scallanan at apple.com (Sean Callanan)
Date: Sat, 06 Aug 2011 00:28:14 -0000
Subject: [Lldb-commits] [lldb] r137004 - in /lldb/trunk:
source/Expression/ClangExpressionDeclMap.cpp
test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
Message-ID: <20110806002814.C56F22A6C12C@llvm.org>
Author: spyffe
Date: Fri Aug 5 19:28:14 2011
New Revision: 137004
URL: http://llvm.org/viewvc/llvm-project?rev=137004&view=rev
Log:
Made the expression parser use the StackFrame's
variable search API rather than rolling its own,
fixing one of our testcases.
Modified:
lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
lldb/trunk/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=137004&r1=137003&r2=137004&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Aug 5 19:28:14 2011
@@ -1572,40 +1572,18 @@
{
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
- VariableList *var_list = frame.GetVariableList(true);
-
- if (!var_list)
- return lldb::VariableSP();
+ ValueObjectSP valobj;
+ VariableSP var_sp;
+ Error err;
- lldb::VariableSP var_sp (var_list->FindVariable(name));
+ valobj = frame.GetValueForVariableExpressionPath(name.GetCString(),
+ eNoDynamicValues,
+ StackFrame::eExpressionPathOptionCheckPtrVsMember,
+ var_sp,
+ err);
- const bool append = true;
- const uint32_t max_matches = 1;
- if (!var_sp)
- {
- // Look for globals elsewhere in the module for the frame
- ModuleSP module_sp (frame.GetSymbolContext(eSymbolContextModule).module_sp);
- if (module_sp)
- {
- VariableList module_globals;
- if (module_sp->FindGlobalVariables (name, append, max_matches, module_globals))
- var_sp = module_globals.GetVariableAtIndex (0);
- }
- }
-
- if (!var_sp)
- {
- // Look for globals elsewhere in the program (all images)
- TargetSP target_sp (frame.GetSymbolContext(eSymbolContextTarget).target_sp);
- if (target_sp)
- {
- VariableList program_globals;
- if (target_sp->GetImages().FindGlobalVariables (name, append, max_matches, program_globals))
- var_sp = program_globals.GetVariableAtIndex (0);
- }
- }
-
- if (!var_sp ||
+ if (!err.Success() ||
+ !var_sp ||
!var_sp->IsInScope(&frame) ||
!var_sp->LocationIsValidForFrame (&frame))
return lldb::VariableSP();
@@ -1745,10 +1723,18 @@
// doesn't start with our phony prefix of '$'
if (name_unique_cstr[0] != '$')
{
- VariableSP var = FindVariableInScope(*m_parser_vars->m_exe_ctx->frame, name);
+ ValueObjectSP valobj;
+ VariableSP var;
+ Error err;
+
+ valobj = m_parser_vars->m_exe_ctx->frame->GetValueForVariableExpressionPath(name_unique_cstr,
+ eNoDynamicValues,
+ StackFrame::eExpressionPathOptionCheckPtrVsMember,
+ var,
+ err);
// If we found a variable in scope, no need to pull up function names
- if (var != NULL)
+ if (err.Success() && var != NULL)
{
AddOneVariable(context, var);
}
Modified: lldb/trunk/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py?rev=137004&r1=137003&r2=137004&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py (original)
+++ lldb/trunk/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py Fri Aug 5 19:28:14 2011
@@ -15,7 +15,6 @@
self.line_to_break = line_number(self.source, '// Set breakpoint here.')
# rdar://problem/9890530
- @unittest2.expectedFailure
def test_eval_index_variable(self):
"""Test expressions of variable 'i' which appears in two for loops."""
self.buildDefault()
From gclayton at apple.com Fri Aug 5 19:50:36 2011
From: gclayton at apple.com (Greg Clayton)
Date: Sat, 06 Aug 2011 00:50:36 -0000
Subject: [Lldb-commits] [lldb] r137008 -
/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
Message-ID: <20110806005036.EFD9E2A6C12C@llvm.org>
Author: gclayton
Date: Fri Aug 5 19:50:36 2011
New Revision: 137008
URL: http://llvm.org/viewvc/llvm-project?rev=137008&view=rev
Log:
Fixed a loop that I was testing changes with and forgot
to revert to zero.
Modified:
lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=137008&r1=137007&r2=137008&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Fri Aug 5 19:50:36 2011
@@ -958,7 +958,7 @@
ModuleList &modules = target.GetImages();
ModuleList not_loaded_modules;
size_t num_modules = modules.GetSize();
- for (size_t i = 1; i < num_modules; i++)
+ for (size_t i = 0; i < num_modules; i++)
{
ModuleSP module_sp = modules.GetModuleAtIndex(i);
if (!module_sp->IsLoadedInTarget (&target))