Author: paulherman
Date: Wed Aug 19 16:44:56 2015
New Revision: 245508
URL: http://llvm.org/viewvc/llvm-project?rev=245508&view=rev
Log:
Fix evaluation of global operators in C++
Added:
lldb/trunk/test/lang/cpp/global_operators/
lldb/trunk/test/lang/cpp/global_operators/Makefile
lldb/trunk/test/lang/cpp/global_operators/TestCppGlobalOperators.py
lldb/trunk/test/lang/cpp/global_operators/main.cpp
Modified:
lldb/trunk/source/Expression/ClangASTSource.cpp
Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=245508&r1=245507&r2=245508&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Wed Aug 19 16:44:56 2015
@@ -125,11 +125,10 @@ ClangASTSource::FindExternalVisibleDecls
}
break;
- // Operator names. Not important for now.
+ // Operator names.
case DeclarationName::CXXOperatorName:
case DeclarationName::CXXLiteralOperatorName:
- SetNoExternalVisibleDeclsForName(decl_ctx, clang_decl_name);
- return false;
+ break;
// Using directives found in this context.
// Tell Sema we didn't find any or we'll end up getting asked a *lot*.
@@ -1964,11 +1963,14 @@ NameSearchContext::AddFunDecl (const Com
false);
}
+ // Pass the identifier info for functions the decl_name is needed for
operators
+ clang::DeclarationName decl_name = m_decl_name.getNameKind() ==
DeclarationName::Identifier ? m_decl_name.getAsIdentifierInfo() : m_decl_name;
+
clang::FunctionDecl *func_decl = FunctionDecl::Create (*ast,
context,
SourceLocation(),
SourceLocation(),
-
m_decl_name.getAsIdentifierInfo(),
+ decl_name,
qual_type,
NULL,
SC_Extern,
Added: lldb/trunk/test/lang/cpp/global_operators/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/global_operators/Makefile?rev=245508&view=auto
==============================================================================
--- lldb/trunk/test/lang/cpp/global_operators/Makefile (added)
+++ lldb/trunk/test/lang/cpp/global_operators/Makefile Wed Aug 19 16:44:56 2015
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added: lldb/trunk/test/lang/cpp/global_operators/TestCppGlobalOperators.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/global_operators/TestCppGlobalOperators.py?rev=245508&view=auto
==============================================================================
--- lldb/trunk/test/lang/cpp/global_operators/TestCppGlobalOperators.py (added)
+++ lldb/trunk/test/lang/cpp/global_operators/TestCppGlobalOperators.py Wed Aug
19 16:44:56 2015
@@ -0,0 +1,72 @@
+"""
+Test that global operators are found and evaluated.
+"""
+import lldb
+from lldbtest import *
+import lldbutil
+
+class TestCppGlobalOperators(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ @skipUnlessDarwin
+ @dsym_test
+ def test_with_dsym_and_run_command(self):
+ self.buildDsym()
+ self.check()
+
+ @dwarf_test
+ def test_with_dwarf_and_run_command(self):
+ self.buildDwarf()
+ self.check()
+
+ def setUp(self):
+ TestBase.setUp(self)
+
+ def check(self):
+ # Get main source file
+ src_file = "main.cpp"
+ src_file_spec = lldb.SBFileSpec(src_file)
+ self.assertTrue(src_file_spec.IsValid(), "Main source file")
+
+ # Get the path of the executable
+ cwd = self.get_process_working_directory()
+ exe_file = "a.out"
+ exe_path = os.path.join(cwd, exe_file)
+
+ # Load the executable
+ target = self.dbg.CreateTarget(exe_path)
+ self.assertTrue(target.IsValid(), VALID_TARGET)
+
+ # Break on main function
+ main_breakpoint = target.BreakpointCreateBySourceRegex("// break
here", src_file_spec)
+ self.assertTrue(main_breakpoint.IsValid() and
main_breakpoint.GetNumLocations() >= 1, VALID_BREAKPOINT)
+
+ # Launch the process
+ args = None
+ env = None
+ process = target.LaunchSimple(args, env, cwd)
+ self.assertTrue(process.IsValid(), PROCESS_IS_VALID)
+
+ # Get the thread of the process
+ self.assertTrue(process.GetState() == lldb.eStateStopped,
PROCESS_STOPPED)
+ thread = lldbutil.get_stopped_thread(process,
lldb.eStopReasonBreakpoint)
+
+ # Check if global operators are evaluated
+ frame = thread.GetSelectedFrame()
+
+ test_result = frame.EvaluateExpression("operator==(s1, s2)")
+ self.assertTrue(test_result.IsValid() and test_result.GetValue() ==
"false", "operator==(s1, s2) = false")
+
+ test_result = frame.EvaluateExpression("operator==(s1, s3)")
+ self.assertTrue(test_result.IsValid() and test_result.GetValue() ==
"true", "operator==(s1, s3) = true")
+
+ test_result = frame.EvaluateExpression("operator==(s2, s3)")
+ self.assertTrue(test_result.IsValid() and test_result.GetValue() ==
"false", "operator==(s2, s3) = false")
+
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
Added: lldb/trunk/test/lang/cpp/global_operators/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/global_operators/main.cpp?rev=245508&view=auto
==============================================================================
--- lldb/trunk/test/lang/cpp/global_operators/main.cpp (added)
+++ lldb/trunk/test/lang/cpp/global_operators/main.cpp Wed Aug 19 16:44:56 2015
@@ -0,0 +1,16 @@
+struct Struct {
+ int value;
+};
+
+bool operator==(const Struct &a, const Struct &b) {
+ return a.value == b.value;
+}
+
+int main() {
+ Struct s1, s2, s3;
+ s1.value = 3;
+ s2.value = 5;
+ s3.value = 3;
+ return 0; // break here
+}
+
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
