Merge pull request #3437 from adrian-prantl/breakpointperf

Add a test to ensure that no SwiftASTContext is initialized for setti…

Author: adrian-prantl

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -1335,13 +1335,18 @@ SwiftASTContext *TypeSystemSwiftTypeRef::GetSwiftASTContext() const {
   return m_swift_ast_context;
 }
 
+SwiftASTContext *TypeSystemSwiftTypeRef::GetSwiftASTContextOrNull() const {
+  return m_swift_ast_context;
+}
+
 void TypeSystemSwiftTypeRef::SetTriple(const llvm::Triple triple) {
   if (auto *swift_ast_context = GetSwiftASTContext())
     swift_ast_context->SetTriple(triple);
 }
 
 void TypeSystemSwiftTypeRef::ClearModuleDependentCaches() {
-  if (auto *swift_ast_context = GetSwiftASTContext())
+  // There is no need to notify a not-yet created SwiftASTContext to reset.
+  if (auto *swift_ast_context = GetSwiftASTContextOrNull())
     swift_ast_context->ClearModuleDependentCaches();
 }
 const char *TypeSystemSwiftTypeRef::AsMangledName(opaque_compiler_type_t type) {

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h

@@ -57,7 +57,10 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   ~TypeSystemSwiftTypeRef();
   TypeSystemSwiftTypeRef(Module &module);
   TypeSystemSwiftTypeRef(SwiftASTContextForExpressions &swift_ast_context);
+  /// Get the corresponding SwiftASTContext, and create one if necessary.
   SwiftASTContext *GetSwiftASTContext() const override;
+  /// Return SwiftASTContext, iff one has already been created.
+  SwiftASTContext *GetSwiftASTContextOrNull() const;
   TypeSystemSwiftTypeRef &GetTypeSystemSwiftTypeRef() override { return *this; }
   void SetTriple(const llvm::Triple triple) override;
   void ClearModuleDependentCaches() override;

lldb/test/API/lang/swift/breakpoint_perf/Makefile

@@ -0,0 +1,2 @@
+SWIFT_SOURCES := main.swift
+include Makefile.rules

lldb/test/API/lang/swift/breakpoint_perf/TestSwiftBreakpointPerf.py

@@ -0,0 +1,31 @@
+import lldb
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbtest as lldbtest
+import lldbsuite.test.lldbutil as lldbutil
+import unittest2
+
+class TestSwiftReflectionLoading(lldbtest.TestBase):
+    mydir = lldbtest.TestBase.compute_mydir(__file__)
+
+    @swiftTest
+    def test(self):
+        """Test that no SwiftASTContext is initialized just to stop at a breakpoint"""
+        self.build()
+
+        log = self.getBuildArtifact("types.log")
+        self.runCmd('log enable lldb types -f "%s"' % log)
+
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
+
+        # Scan through the types log.
+        logfile = open(log, "r")
+        found_typeref = 0
+        found_astctx = 0
+        for line in logfile:
+            if 'TypeSystemSwiftTypeRef("a.out")::TypeSystemSwiftTypeRef()' in line:
+                found_typeref += 1
+            if 'SwiftASTContext' in line:
+                found_astctx += 1
+        self.assertEqual(found_typeref, 1)
+        self.assertEqual(found_astctx, 0)

lldb/test/API/lang/swift/breakpoint_perf/main.swift

@@ -0,0 +1,11 @@
+
+class C {
+  func f() {
+    {
+      print("hello from a complicated context") // Set breakpoint here
+    }()
+  }
+}
+
+let c = C()
+c.f()

lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

@@ -87,6 +87,8 @@ def dotest(self, remap):
             self.expect("fr var foo", comment, substrs=["x", "23"])
             self.expect("fr var bar", comment, substrs=["y", "42"])
             self.assertTrue(os.path.isdir(mod_cache), "module cache exists")
+        else:
+            self.expect("p foo", error=True)
 
         # Scan through the types log.
         errs = 0

lldb/test/API/lang/swift/parseable_interfaces/shared/TestSwiftInterfaceNoDebugInfo.py

@@ -59,6 +59,7 @@ def test_prebuilt_cache_location(self):
         lldbutil.run_to_source_breakpoint(
            self, "break here", lldb.SBFileSpec("main.swift"),
            exe_name=self.getBuildArtifact("main"))
+        self.expect("expr 1")
 
         # Check the prebuilt cache path in the log output
         prefix = 'Using prebuilt Swift module cache path: '