commit b036f557cee5b8eb87f0bffa7c305df6eda98437
author Raphael Isemann <teemperor@gmail.com> Wed Dec 25 23:43:52 2019 +0100
committer Raphael Isemann <teemperor@gmail.com> Thu Dec 26 10:36:36 2019 +0100
tree 0c6bd51eeb1ada6be3900eb42e0b08669b904fa9
parent 073cdb239044dc056a3c79b995265f640ffb40e6

[lldb] Remove some calls to GetASTContext

GetASTContext is really expensive to call as it makes use of the global
mapping from ASTContext to ClangASTContext. This replaces all calls where
we already have the ClangASTContext around and don't need to call
GetASTContext again.

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
index 60afa12..ec1f347 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
@@ -816,9 +816,8 @@
 
     QualType class_qual_type(class_decl->getTypeForDecl(), 0);
 
-    TypeFromUser class_user_type(
-        class_qual_type.getAsOpaquePtr(),
-        ClangASTContext::GetASTContext(&class_decl->getASTContext()));
+    TypeFromUser class_user_type(class_qual_type.getAsOpaquePtr(),
+                                 function_decl_ctx.GetTypeSystem());
 
     LLDB_LOG(log, "  CEDM::FEVD[{0}] Adding type for $__lldb_class: {1}",
              current_id, class_qual_type.getAsString());
@@ -831,9 +830,8 @@
       QualType class_pointer_type =
           method_decl->getASTContext().getPointerType(class_qual_type);
 
-      TypeFromUser self_user_type(
-          class_pointer_type.getAsOpaquePtr(),
-          ClangASTContext::GetASTContext(&method_decl->getASTContext()));
+      TypeFromUser self_user_type(class_pointer_type.getAsOpaquePtr(),
+                                  function_decl_ctx.GetTypeSystem());
 
       m_struct_vars->m_object_pointer_type = self_user_type;
     }
@@ -926,9 +924,8 @@
       return; // This is unlikely, but we have seen crashes where this
               // occurred
 
-    TypeFromUser class_user_type(
-        QualType(interface_type, 0).getAsOpaquePtr(),
-        ClangASTContext::GetASTContext(&method_decl->getASTContext()));
+    TypeFromUser class_user_type(QualType(interface_type, 0).getAsOpaquePtr(),
+                                 function_decl_ctx.GetTypeSystem());
 
     LLDB_LOG(log, "  FEVD[{0}] Adding type for $__lldb_objc_class: {1}",
              current_id, ClangUtil::ToString(interface_type));
@@ -942,18 +939,16 @@
           method_decl->getASTContext().getObjCObjectPointerType(
               QualType(interface_type, 0));
 
-      TypeFromUser self_user_type(
-          class_pointer_type.getAsOpaquePtr(),
-          ClangASTContext::GetASTContext(&method_decl->getASTContext()));
+      TypeFromUser self_user_type(class_pointer_type.getAsOpaquePtr(),
+                                  function_decl_ctx.GetTypeSystem());
 
       m_struct_vars->m_object_pointer_type = self_user_type;
     } else {
       // self is a Class pointer
       QualType class_type = method_decl->getASTContext().getObjCClassType();
 
-      TypeFromUser self_user_type(
-          class_type.getAsOpaquePtr(),
-          ClangASTContext::GetASTContext(&method_decl->getASTContext()));
+      TypeFromUser self_user_type(class_type.getAsOpaquePtr(),
+                                  function_decl_ctx.GetTypeSystem());
 
       m_struct_vars->m_object_pointer_type = self_user_type;
     }