[Target] Remove Target::GetScratchClangASTContext

[xiaobai]

Summary

Target doesn't really need to know about ClangASTContext more than any
other TypeSystem. We can create a method ClangASTContext::GetScratch for
anything who needs a ClangASTContext specifically instead of just a
generic TypeSystem.

[xiaobai]

Remove ClangASTContext header from Target.cpp

[teemperor]

LGTM

[jingham]

This seems partly wrong to me. The point is that the Target holds scratch AST contexts for all the languages it supports. They are the central repository for the accumulation of effects of expressions evaluated while that target is alive. For instance, all the user defined types and variables go there. The Target also manages its lifecycle. For instance, in the swift case if there's a module that we can't import, we have to fall back to making an AST Context for each module we can successfully import and dispatching expressions to the appropriate one of those.

So all the Scratch AST Contexts are properly owned by the target.

This move doesn't keep all the clients from knowing they are getting their hands on a ClangASTContext, so it doesn't seem like it achieves much hiding. All it does is conceal the ownership of the scratch AST context for C-family languages.

[xiaobai]

In D64844#1589794, @jingham wrote:

This seems partly wrong to me. The point is that the Target holds scratch AST contexts for all the languages it supports. They are the central repository for the accumulation of effects of expressions evaluated while that target is alive. For instance, all the user defined types and variables go there. The Target also manages its lifecycle. For instance, in the swift case if there's a module that we can't import, we have to fall back to making an AST Context for each module we can successfully import and dispatching expressions to the appropriate one of those.

So all the Scratch AST Contexts are properly owned by the target.

This move doesn't keep all the clients from knowing they are getting their hands on a ClangASTContext, so it doesn't seem like it achieves much hiding. All it does is conceal the ownership of the scratch AST context for C-family languages.

Right, I'm not trying to remove Target's ownership of any scratch type systems. My goal is to remove Target's knowledge about specific scratch type systems. Target shouldn't have to know about ClangASTContext specifically. It should hand out scratch TypeSystems based on what language you give it which it already does today with GetScratchTypeSystemForLanguage. I'm not trying to hide this information from clients, I'm trying to hide the knowledge from Target.

[jingham]

I think I understand your goal - a worthy one, BTW... But I think this is an unnecessary step along that path.

After all, all the clients of the Target's Scratch TypeSystem for C-family languages should be able to do what they need to do with a TypeSystem, rather than a ClangASTContext. And that's really your goal. It doesn't help much if Target doesn't need to know about ClangASTContext but everyone else (breakpoints, watchpoints, the LanguageRuntimes, etc.) who uses the C-family language Scratch TypeSystem does.

So you don't want to just move Target::GetScratchClangASTContext around, you want to get rid of it. Everybody who was calling Target::GetScratchClangASTContext should call Target::GetScratchTypeSystemForLanguage and that should be sufficient for them.

So a better approach, it seems to me, would be to remove Target::GetScratchClangASTContext altogether, convert all it's callers to Target::GetScratchTypeSystemForLanguage and try changing the type the callers receive from ClangASTContext * to TypeSystem *. Then if any of them ACTUALLY needed to cast this from a TypeSystem to a ClangASTContext, you can change the type back to ClangASTContext, do the cast in situ and add a FIXME: You should be able to do this with a TypeSystem.

That has the - to me - desirable benefit of keeping it clear that these scratch type systems are things handed out by the target, which your change makes less clear. Plus it will quickly show us what is missing from TypeSystem. Or maybe, you will find that for most uses, a TypeSystem WAS good enough, which will be double goodness!

[jingham]

Seems like in most places we're just pulling out basic types or their sizes, which we should certainly be able to do with a TypeSystem.

[xiaobai]

Yes, I agree that replacing ClangASTContext uses with TypeSystem would be the right thing to do, and it's what I plan on doing next. There are instances where you really do want a ClangASTContext (e.g. in plugins related to clang expression parsing and objc), and so having a convenience function like this means you don't have to cast the result of every call. This is similar to ObjCLanguageRuntime::Get. I don't mind abandoning this patch though.

Luckily, like you pointed out, most uses of ClangASTContext are very generalizable so it shouldn't be too bad to change things over.

[jingham]

The nice thing about the way the ObjCLanguageRuntime::Get was that is was only useable where we decided it was legit to use it, in the actual ObjCLanguageRuntime plugin or its direct users. If you want to keep the convenience cast function in a header in Plugins/ExpressionParser/Clang, that would be fine.

[xiaobai]

Rebased
Moved this change to the monorepo layout
Moved ClangASTContext::GetScratch to the ClangASTContext header

[xiaobai]

Rebase

[xiaobai]

ping @jingham @teemperor any issues with this going in? I'd like to land this soon.

[jingham]

This looks fine, sorry for leaving it too long in the In tray...

[xiaobai]

Landed as commit 3031818a2e9fca1e53cd882ccfcc3718699991b4

include/lldb/Symbol/ClangASTContext.h

public:
 
   // Constructors and Destructors
   ClangASTContext(const char *triple = nullptr);
 
   ~ClangASTContext() override;
 
   void Finalize() override;
 
+  static ClangASTContext *GetScratch(Target &target,
+                                     bool create_on_demand = true);
+
   // PluginInterface functions
   ConstString GetPluginName() override;
 
   uint32_t GetPluginVersion() override;
 
   static ConstString GetPluginNameStatic();
 
   static lldb::TypeSystemSP CreateInstance(lldb::LanguageType language,

include/lldb/Target/Target.h

void ApplyNameToBreakpoints(BreakpointName &bp_name);
   // parameters have the same meaning as for the UtilityFunction constructor.
   // Returns a new-ed object which the caller owns.
 
   UtilityFunction *GetUtilityFunctionForLanguage(const char *expr,
                                                  lldb::LanguageType language,
                                                  const char *name,
                                                  Status &error);
 
-  ClangASTContext *GetScratchClangASTContext(bool create_on_demand = true);
-
   lldb::ClangASTImporterSP GetClangASTImporter();
 
   // Install any files through the platform that need be to installed prior to
   // launching or attaching.
   Status Install(ProcessLaunchInfo *launch_info);
 
   bool ResolveFileAddress(lldb::addr_t load_addr, Address &so_addr);
 

source/API/SBTarget.cpp

if (auto process_sp = target_sp->GetProcessSP()) {
           auto types = vendor->FindTypes(const_typename, /*max_matches*/ 1);
           if (!types.empty())
             return LLDB_RECORD_RESULT(SBType(types.front()));
         }
       }
     }
 
     // No matches, search for basic typename matches
-    ClangASTContext *clang_ast = target_sp->GetScratchClangASTContext();
+    auto *clang_ast = ClangASTContext::GetScratch(*target_sp);
     if (clang_ast)
       return LLDB_RECORD_RESULT(SBType(ClangASTContext::GetBasicType(
           clang_ast->getASTContext(), const_typename)));
   }
   return LLDB_RECORD_RESULT(SBType());
 }
 
 SBType SBTarget::GetBasicType(lldb::BasicType type) {
   LLDB_RECORD_METHOD(lldb::SBType, SBTarget, GetBasicType, (lldb::BasicType),
                      type);
 
   TargetSP target_sp(GetSP());
   if (target_sp) {
-    ClangASTContext *clang_ast = target_sp->GetScratchClangASTContext();
+    auto *clang_ast = ClangASTContext::GetScratch(*target_sp);
     if (clang_ast)
       return LLDB_RECORD_RESULT(SBType(
           ClangASTContext::GetBasicType(clang_ast->getASTContext(), type)));
   }
   return LLDB_RECORD_RESULT(SBType());
 }
 
 lldb::SBTypeList SBTarget::FindTypes(const char *typename_cstr) {
if (auto process_sp = target_sp->GetProcessSP()) {
           for (auto type : types)
             sb_type_list.Append(SBType(type));
         }
       }
     }
 
     if (sb_type_list.GetSize() == 0) {
       // No matches, search for basic typename matches
-      ClangASTContext *clang_ast = target_sp->GetScratchClangASTContext();
+      auto *clang_ast = ClangASTContext::GetScratch(*target_sp);
       if (clang_ast)
         sb_type_list.Append(SBType(ClangASTContext::GetBasicType(
             clang_ast->getASTContext(), const_typename)));
     }
   }
   return LLDB_RECORD_RESULT(sb_type_list);
 }
 

source/Breakpoint/Watchpoint.cpp

: StoppointLocation(0, addr, size, hardware), m_target(target),
       m_watch_write(0), m_watch_was_read(0), m_watch_was_written(0),
       m_ignore_count(0), m_false_alarms(0), m_decl_str(), m_watch_spec_str(),
       m_type(), m_error(), m_options(), m_being_created(true) {
   if (type && type->IsValid())
     m_type = *type;
   else {
     // If we don't have a known type, then we force it to unsigned int of the
     // right size.
-    ClangASTContext *ast_context = target.GetScratchClangASTContext();
+    auto *ast_context = ClangASTContext::GetScratch(target);
     m_type = ast_context->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint,
                                                               8 * size);
   }
 
   // Set the initial value of the watched variable:
   if (m_target.GetProcessSP()) {
     ExecutionContext exe_ctx;
     m_target.GetProcessSP()->CalculateExecutionContext(exe_ctx);

source/Core/DumpDataExtractor.cpp

for (uint32_t count = 0; DE.ValidOffset(offset) && count < item_count;
     } break;
 
     case eFormatFloat: {
       TargetSP target_sp;
       bool used_upfloat = false;
       if (exe_scope)
         target_sp = exe_scope->CalculateTarget();
       if (target_sp) {
-        ClangASTContext *clang_ast = target_sp->GetScratchClangASTContext();
+        auto *clang_ast = ClangASTContext::GetScratch(*target_sp);
         if (clang_ast) {
           clang::ASTContext *ast = clang_ast->getASTContext();
           if (ast) {
             llvm::SmallVector<char, 256> sv;
             // Show full precision when printing float values
             const unsigned format_precision = 0;
             const unsigned format_max_padding = 100;
             size_t item_bit_size = item_byte_size * 8;

source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

if (target.ReadMemory(tls_addr, false, buf, tsl_data_size, error) ==
         if (tid_pos != m_tid_to_tls_map.end()) {
           auto tls_pos = tid_pos->second.find(pthread_key);
           if (tls_pos != tid_pos->second.end()) {
             return tls_pos->second + tls_offset;
           }
         }
         StackFrameSP frame_sp = thread_sp->GetStackFrameAtIndex(0);
         if (frame_sp) {
-          ClangASTContext *clang_ast_context =
-              target.GetScratchClangASTContext();
+          auto *clang_ast_context = ClangASTContext::GetScratch(target);
 
           if (!clang_ast_context)
             return LLDB_INVALID_ADDRESS;
 
           CompilerType clang_void_ptr_type =
               clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
           Address pthread_getspecific_addr = GetPthreadSetSpecificAddress();
           if (pthread_getspecific_addr.IsValid()) {

source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp

if (dyld_instance->m_image_infos_stop_id != UINT32_MAX &&
     return false;
   }
 
   const lldb::ABISP &abi = process->GetABI();
   if (abi) {
     // Build up the value array to store the three arguments given above, then
     // get the values from the ABI:
 
-    ClangASTContext *clang_ast_context =
-        process->GetTarget().GetScratchClangASTContext();
+    auto *clang_ast_context = ClangASTContext::GetScratch(process->GetTarget());
     ValueList argument_values;
 
     Value mode_value;    // enum dyld_notify_mode { dyld_notify_adding=0,
                          // dyld_notify_removing=1, dyld_notify_remove_all=2 };
     Value count_value;   // unsigned long count
     Value headers_value; // uint64_t machHeaders[] (aka void*)
 
     CompilerType clang_void_ptr_type =

source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp

bool DynamicLoaderMacOSXDYLD::NotifyBreakpointHit(
   if (dyld_instance->InitializeFromAllImageInfos())
     return dyld_instance->GetStopWhenImagesChange();
 
   const lldb::ABISP &abi = process->GetABI();
   if (abi) {
     // Build up the value array to store the three arguments given above, then
     // get the values from the ABI:
 
-    ClangASTContext *clang_ast_context =
-        process->GetTarget().GetScratchClangASTContext();
+    auto *clang_ast_context = ClangASTContext::GetScratch(process->GetTarget());
     ValueList argument_values;
     Value input_value;
 
     CompilerType clang_void_ptr_type =
         clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
     CompilerType clang_uint32_type =
         clang_ast_context->GetBuiltinTypeForEncodingAndBitSize(
             lldb::eEncodingUint, 32);

source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp

 }
 
 void ASTResultSynthesizer::CommitPersistentDecls() {
   for (clang::NamedDecl *decl : m_decls) {
     StringRef name = decl->getName();
     ConstString name_cs(name.str().c_str());
 
     Decl *D_scratch = m_target.GetClangASTImporter()->DeportDecl(
-        m_target.GetScratchClangASTContext()->getASTContext(), m_ast_context,
+        ClangASTContext::GetScratch(m_target)->getASTContext(), m_ast_context,
         decl);
 
     if (!D_scratch) {
       Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
 
       if (log) {
         std::string s;
         llvm::raw_string_ostream ss(s);

source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp

do {
 
       sources.push_back(modules_decl_vendor->GetImporterSource());
     } while (false);
 
     if (!is_shared_context) {
       // Update the scratch AST context's merger to reflect any new sources we
       // might have come across since the last time an expression was parsed.
 
-      auto scratch_ast_context = static_cast<ClangASTContextForExpressions*>(
-          m_target->GetScratchClangASTContext());
+      auto *scratch_ast_context = static_cast<ClangASTContextForExpressions *>(
+          ClangASTContext::GetScratch(*m_target));
 
       scratch_ast_context->GetMergerUnchecked().AddSources(sources);
 
       sources.push_back({*scratch_ast_context->getASTContext(),
                          *scratch_ast_context->getFileManager(),
                          scratch_ast_context->GetOriginMap()});
     }
     while (false)
       ;
 
     m_merger_up =
         llvm::make_unique<clang::ExternalASTMerger>(target, sources);
   } else {
     m_ast_importer_sp->InstallMapCompleter(&ast_context, *this);
   }
 }
 
 ClangASTSource::~ClangASTSource() {
   if (m_ast_importer_sp)
     m_ast_importer_sp->ForgetDestination(m_ast_context);
 
   // We are in the process of destruction, don't create clang ast context on
-  // demand by passing false to
-  // Target::GetScratchClangASTContext(create_on_demand).
-  ClangASTContext *scratch_clang_ast_context =
-      m_target->GetScratchClangASTContext(false);
+  // demand by passing false to ClangASTContext::GetScratch().
+  auto *scratch_clang_ast_context =
+      ClangASTContext::GetScratch(*m_target, false);
 
   if (!scratch_clang_ast_context)
     return;
 
   clang::ASTContext *scratch_ast_context =
       scratch_clang_ast_context->getASTContext();
 
   if (!scratch_ast_context)

source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

else if (exe_ctx.GetProcessPtr()) {
     m_parser_vars->m_sym_ctx.Clear(true);
     m_parser_vars->m_sym_ctx.target_sp = exe_ctx.GetTargetSP();
   }
 
   if (target) {
     m_parser_vars->m_persistent_vars = llvm::cast<ClangPersistentVariables>(
         target->GetPersistentExpressionStateForLanguage(eLanguageTypeC));
 
-    if (!target->GetScratchClangASTContext())
+    if (!ClangASTContext::GetScratch(*target))
       return false;
   }
 
   m_parser_vars->m_target_info = GetTargetInfo();
   m_parser_vars->m_materializer = materializer;
 
   return true;
 }
if (ret_or_error) {
     LLDB_LOG_ERROR(log, ret_or_error.takeError(), "Couldn't import type: {0}");
     return clang::QualType();
   }
 }
 
 TypeFromUser ClangExpressionDeclMap::DeportType(ClangASTContext &target,
                                                 ClangASTContext &source,
                                                 TypeFromParser parser_type) {
-  assert (&target == m_target->GetScratchClangASTContext());
+  assert(&target == ClangASTContext::GetScratch(*m_target));
   assert ((TypeSystem*)&source == parser_type.GetTypeSystem());
   assert (source.getASTContext() == m_ast_context);
   
   if (m_ast_importer_sp) {
     return TypeFromUser(m_ast_importer_sp->DeportType(
                             target.getASTContext(), source.getASTContext(),
                             parser_type.GetOpaqueQualType()),
                         &target);
   } else if (m_merger_up) {
     clang::FileID source_file =
         source.getASTContext()->getSourceManager().getFileID(
             source.getASTContext()->getTranslationUnitDecl()->getLocation());
-    auto scratch_ast_context = static_cast<ClangASTContextForExpressions*>(
-        m_target->GetScratchClangASTContext());
+    auto scratch_ast_context = static_cast<ClangASTContextForExpressions *>(
+        ClangASTContext::GetScratch(*m_target));
     clang::QualType exported_type = ExportAllDeclaredTypes(
         scratch_ast_context->GetMergerUnchecked(),
         *source.getASTContext(), *source.getFileManager(),
         m_merger_up->GetOrigins(),
         source_file,
         clang::QualType::getFromOpaquePtr(parser_type.GetOpaqueQualType()));
     return TypeFromUser(exported_type.getAsOpaquePtr(), &target);
   } else {
if (m_parser_vars->m_materializer && is_result) {
     Status err;
 
     ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx;
     Target *target = exe_ctx.GetTargetPtr();
     if (target == nullptr)
       return false;
 
     TypeFromUser user_type =
-        DeportType(*target->GetScratchClangASTContext(), *ast, parser_type);
+        DeportType(*ClangASTContext::GetScratch(*target), *ast, parser_type);
 
     uint32_t offset = m_parser_vars->m_materializer->AddResultVariable(
         user_type, is_lvalue, m_keep_result_in_memory, m_result_delegate, err);
 
     ClangExpressionVariable *var = new ClangExpressionVariable(
         exe_ctx.GetBestExecutionContextScope(), name, user_type,
         m_parser_vars->m_target_info.byte_order,
         m_parser_vars->m_target_info.address_byte_size);
bool ClangExpressionDeclMap::AddPersistentVariable(const NamedDecl *decl,
   }
 
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
   ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx;
   Target *target = exe_ctx.GetTargetPtr();
   if (target == nullptr)
     return false;
 
-  ClangASTContext *context(target->GetScratchClangASTContext());
+  auto *context(ClangASTContext::GetScratch(*target));
 
   TypeFromUser user_type = DeportType(*context, *ast, parser_type);
 
   if (!user_type.GetOpaqueQualType()) {
     if (log)
       log->Printf("Persistent variable's type wasn't copied successfully");
     return false;
   }
sym_ctx = frame->GetSymbolContext(lldb::eSymbolContextFunction |
                                       lldb::eSymbolContextBlock);
 
   // Try the persistent decls, which take precedence over all else.
   if (!namespace_decl) {
     do {
       if (!target)
         break;
 
-      ClangASTContext *scratch_clang_ast_context =
-          target->GetScratchClangASTContext();
+      auto *scratch_clang_ast_context = ClangASTContext::GetScratch(*target);
 
       if (!scratch_clang_ast_context)
         break;
 
       ASTContext *scratch_ast_context =
           scratch_clang_ast_context->getASTContext();
 
       if (!scratch_ast_context)
void ClangExpressionDeclMap::AddOneGenericVariable(NameSearchContext &context,
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
 
   Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr();
 
   if (target == nullptr)
     return;
 
   ASTContext *scratch_ast_context =
-      target->GetScratchClangASTContext()->getASTContext();
+      ClangASTContext::GetScratch(*target)->getASTContext();
 
   TypeFromUser user_type(
       ClangASTContext::GetBasicType(scratch_ast_context, eBasicTypeVoid)
           .GetPointerType()
           .GetLValueReferenceType());
   TypeFromParser parser_type(
       ClangASTContext::GetBasicType(m_ast_context, eBasicTypeVoid)
           .GetPointerType()
log->Printf("  CEDM::FEVD[%u] Found variable %s, returned %s", current_id,
                 decl_name.c_str(), ast_dumper.GetCString());
   }
 }
 
 bool ClangExpressionDeclMap::ResolveUnknownTypes() {
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
   Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr();
 
-  ClangASTContextForExpressions *scratch_ast_context =
-      static_cast<ClangASTContextForExpressions*>(
-          target->GetScratchClangASTContext());
+  auto *scratch_ast_context = static_cast<ClangASTContextForExpressions *>(
+      ClangASTContext::GetScratch(*target));
 
   for (size_t index = 0, num_entities = m_found_entities.GetSize();
        index < num_entities; ++index) {
     ExpressionVariableSP entity = m_found_entities.GetVariableAtIndex(index);
 
     ClangExpressionVariable::ParserVars *parser_vars =
         llvm::cast<ClangExpressionVariable>(entity.get())
             ->GetParserVars(GetParserID());

source/Plugins/Language/CPlusPlus/LibCxx.cpp

if (summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryCapped) {
     if (size > max_size) {
       size = max_size;
       options.SetIsTruncated(true);
     }
   }
   location_sp->GetPointeeData(extractor, 0, size);
 
   // std::wstring::size() is measured in 'characters', not bytes
-  auto wchar_t_size = valobj.GetTargetSP()
-                          ->GetScratchClangASTContext()
+  auto wchar_t_size = ClangASTContext::GetScratch(*(valobj.GetTargetSP()))
                           ->GetBasicType(lldb::eBasicTypeWChar)
                           .GetByteSize(nullptr);
   if (!wchar_t_size)
     return false;
 
   options.SetData(extractor);
   options.SetStream(&stream);
   options.SetPrefixToken("L");

source/Plugins/Language/ObjC/NSArray.cpp

bool lldb_private::formatters::NSArraySummaryProvider(
   return true;
 }
 
 lldb_private::formatters::NSArrayMSyntheticFrontEndBase::NSArrayMSyntheticFrontEndBase(
     lldb::ValueObjectSP valobj_sp)
     : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(), m_ptr_size(8),
       m_id_type() {
   if (valobj_sp) {
-    clang::ASTContext *ast = valobj_sp->GetExecutionContextRef()
-                                 .GetTargetSP()
-                                 ->GetScratchClangASTContext()
-                                 ->getASTContext();
+    clang::ASTContext *ast =
+        ClangASTContext::GetScratch(
+            *(valobj_sp->GetExecutionContextRef().GetTargetSP()))
     if (ast)
       m_id_type = CompilerType(ast, ast->ObjCBuiltinIdTy);
     if (valobj_sp->GetProcessSP())
       m_ptr_size = valobj_sp->GetProcessSP()->GetAddressByteSize();
   }
 }
 
 template <typename D32, typename D64>

 lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
   GenericNSArrayISyntheticFrontEnd(
     lldb::ValueObjectSP valobj_sp)
     : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(), m_ptr_size(8),
       m_data_32(nullptr), m_data_64(nullptr) {
   if (valobj_sp) {
     CompilerType type = valobj_sp->GetCompilerType();
     if (type) {
-      ClangASTContext *ast = valobj_sp->GetExecutionContextRef()
-                                 .GetTargetSP()
-                                 ->GetScratchClangASTContext();
+      auto *ast = ClangASTContext::GetScratch(
+          *(valobj_sp->GetExecutionContextRef().GetTargetSP()));
       if (ast)
         m_id_type = CompilerType(ast->getASTContext(),
                                  ast->getASTContext()->ObjCBuiltinIdTy);
     }
   }
 }
 
 template <typename D32, typename D64, bool Inline>

 }
 
 lldb::ValueObjectSP
 lldb_private::formatters::NSArray1SyntheticFrontEnd::GetChildAtIndex(
     size_t idx) {
   static const ConstString g_zero("[0]");
 
   if (idx == 0) {
-    CompilerType id_type(
-        m_backend.GetTargetSP()->GetScratchClangASTContext()->GetBasicType(
-            lldb::eBasicTypeObjCID));
+    CompilerType id_type(ClangASTContext::GetScratch(*(m_backend.GetTargetSP()))
+                             ->GetBasicType(lldb::eBasicTypeObjCID));
     return m_backend.GetSyntheticChildAtOffset(
         m_backend.GetProcessSP()->GetAddressByteSize(), id_type, true, g_zero);
   }
   return lldb::ValueObjectSP();
 }
 
 SyntheticChildrenFrontEnd *
 lldb_private::formatters::NSArraySyntheticFrontEndCreator(

source/Plugins/Language/ObjC/NSDictionary.cpp

NSDictionary_Additionals::GetAdditionalSynthetics() {
   static AdditionalFormatters<CXXSyntheticChildren::CreateFrontEndCallback>
       g_map;
   return g_map;
 }
 
 static CompilerType GetLLDBNSPairType(TargetSP target_sp) {
   CompilerType compiler_type;
 
-  ClangASTContext *target_ast_context = target_sp->GetScratchClangASTContext();
+  auto *target_ast_context = ClangASTContext::GetScratch(*target_sp);
 
   if (target_ast_context) {
     ConstString g___lldb_autogen_nspair("__lldb_autogen_nspair");
 
     compiler_type =
         target_ast_context->GetTypeForIdentifier<clang::CXXRecordDecl>(
             g___lldb_autogen_nspair);
 

source/Plugins/Language/ObjC/NSError.cpp

if (!domain_str_value) {
     stream.Printf("domain: nil - code: %" PRIu64, code);
     return true;
   }
 
   InferiorSizedWord isw(domain_str_value, *process_sp);
 
   ValueObjectSP domain_str_sp = ValueObject::CreateValueObjectFromData(
       "domain_str", isw.GetAsData(process_sp->GetByteOrder()),
-      valobj.GetExecutionContextRef(), process_sp->GetTarget()
-                                           .GetScratchClangASTContext()
-                                           ->GetBasicType(lldb::eBasicTypeVoid)
-                                           .GetPointerType());
+      valobj.GetExecutionContextRef(),
+      ClangASTContext::GetScratch(process_sp->GetTarget())
 
   if (!domain_str_sp)
     return false;
 
   StreamString domain_str_summary;
   if (NSStringSummaryProvider(*domain_str_sp, domain_str_summary, options) &&
       !domain_str_summary.Empty()) {
     stream.Printf("domain: %s - code: %" PRIu64, domain_str_summary.GetData(),
bool Update() override {
     lldb::addr_t userinfo =
         process_sp->ReadPointerFromMemory(userinfo_location, error);
     if (userinfo == LLDB_INVALID_ADDRESS || error.Fail())
       return false;
     InferiorSizedWord isw(userinfo, *process_sp);
     m_child_sp = CreateValueObjectFromData(
         "_userInfo", isw.GetAsData(process_sp->GetByteOrder()),
         m_backend.GetExecutionContextRef(),
-        process_sp->GetTarget().GetScratchClangASTContext()->GetBasicType(
-            lldb::eBasicTypeObjCID));
+        ClangASTContext::GetScratch(process_sp->GetTarget())
+            ->GetBasicType(lldb::eBasicTypeObjCID));
     return false;
   }
 
   bool MightHaveChildren() override { return true; }
 
   size_t GetIndexOfChildWithName(ConstString name) override {
     static ConstString g___userInfo("_userInfo");
     if (name == g___userInfo)

source/Plugins/Language/ObjC/NSException.cpp

static bool ExtractFields(ValueObject &valobj, ValueObjectSP *name_sp,
   if (error.Fail() || reserved == LLDB_INVALID_ADDRESS)
     return false;
 
   InferiorSizedWord name_isw(name, *process_sp);
   InferiorSizedWord reason_isw(reason, *process_sp);
   InferiorSizedWord userinfo_isw(userinfo, *process_sp);
   InferiorSizedWord reserved_isw(reserved, *process_sp);
 
-  CompilerType voidstar = process_sp->GetTarget()
-                              .GetScratchClangASTContext()
+  CompilerType voidstar = ClangASTContext::GetScratch(process_sp->GetTarget())
                               ->GetBasicType(lldb::eBasicTypeVoid)
                               .GetPointerType();
 
   if (name_sp)
     *name_sp = ValueObject::CreateValueObjectFromData(
         "name", name_isw.GetAsData(process_sp->GetByteOrder()),
         valobj.GetExecutionContextRef(), voidstar);
   if (reason_sp)

source/Plugins/Language/ObjC/NSIndexPath.cpp

public:
 
   bool Update() override {
     m_impl.Clear();
 
     TypeSystem *type_system = m_backend.GetCompilerType().GetTypeSystem();
     if (!type_system)
       return false;
 
-    ClangASTContext *ast = m_backend.GetExecutionContextRef()
-                               .GetTargetSP()
-                               ->GetScratchClangASTContext();
+    auto *ast = ClangASTContext::GetScratch(
+        *m_backend.GetExecutionContextRef().GetTargetSP());
     if (!ast)
       return false;
 
     m_uint_star_type = ast->GetPointerSizedIntType(false);
 
     static ConstString g__indexes("_indexes");
     static ConstString g__length("_length");
 

source/Plugins/Language/ObjC/NSString.cpp

 NSString_Additionals::GetAdditionalSummaries() {
   static std::map<ConstString, CXXFunctionSummaryFormat::Callback> g_map;
   return g_map;
 }
 
 static CompilerType GetNSPathStore2Type(Target &target) {
   static ConstString g_type_name("__lldb_autogen_nspathstore2");
 
-  ClangASTContext *ast_ctx = target.GetScratchClangASTContext();
+  auto *ast_ctx = ClangASTContext::GetScratch(target);
 
   if (!ast_ctx)
     return CompilerType();
 
   CompilerType voidstar =
       ast_ctx->GetBasicType(lldb::eBasicTypeVoid).GetPointerType();
   CompilerType uint32 =
       ast_ctx->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 32);

source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp

return m_process->GetBreakpointSiteList().BreakpointSiteContainsBreakpoint(
       break_site_id, m_cxx_exception_bp_sp->GetID());
 }
 
 ValueObjectSP ItaniumABILanguageRuntime::GetExceptionObjectForThread(
     ThreadSP thread_sp) {
   if (!thread_sp->SafeToCallFunctions())
     return {};
 
-  ClangASTContext *clang_ast_context =
-      m_process->GetTarget().GetScratchClangASTContext();
+  auto *clang_ast_context = ClangASTContext::GetScratch(m_process->GetTarget());
   CompilerType voidstar =
       clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
 
   DiagnosticManager diagnostics;
   ExecutionContext exe_ctx;
   EvaluateExpressionOptions options;
 
   options.SetUnwindOnError(true);

source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp

bool AppleObjCRuntime::GetObjectDescription(Stream &strm, Value &value,
   CompilerType compiler_type = value.GetCompilerType();
   if (compiler_type) {
     if (!ClangASTContext::IsObjCObjectPointerType(compiler_type)) {
       strm.Printf("Value doesn't point to an ObjC object.\n");
       return false;
     }
   } else {
     // If it is not a pointer, see if we can make it into a pointer.
-    ClangASTContext *ast_context = target->GetScratchClangASTContext();
+    auto *ast_context = ClangASTContext::GetScratch(*target);
     CompilerType opaque_type = ast_context->GetBasicType(eBasicTypeObjCID);
     if (!opaque_type)
       opaque_type = ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
     // value.SetContext(Value::eContextTypeClangType, opaque_type_ptr);
     value.SetCompilerType(opaque_type);
   }
 
   ValueList arg_value_list;
   arg_value_list.PushValue(value);
 
   // This is the return value:
-  ClangASTContext *ast_context = target->GetScratchClangASTContext();
+  auto *ast_context = ClangASTContext::GetScratch(*target);
 
   CompilerType return_compiler_type = ast_context->GetCStringType(true);
   Value ret;
   //    ret.SetContext(Value::eContextTypeClangType, return_compiler_type);
   ret.SetCompilerType(return_compiler_type);
 
   if (exe_ctx.GetFramePtr() == nullptr) {
     Thread *thread = exe_ctx.GetThreadPtr();
ThreadSP AppleObjCRuntime::GetBacktraceThreadFromException(
   ValueObjectSP reserved_dict =
       exception_sp->GetChildMemberWithName(ConstString("reserved"), true);
   if (!reserved_dict) return ThreadSP();
 
   reserved_dict = reserved_dict->GetSyntheticValue();
   if (!reserved_dict) return ThreadSP();
 
   CompilerType objc_id =
-      exception_sp->GetTargetSP()->GetScratchClangASTContext()->GetBasicType(
-          lldb::eBasicTypeObjCID);
+      ClangASTContext::GetScratch(*(exception_sp->GetTargetSP()))
+          ->GetBasicType(lldb::eBasicTypeObjCID);
   ValueObjectSP return_addresses;
 
   auto objc_object_from_address = [&exception_sp, &objc_id](uint64_t addr,
                                                             const char *name) {
     Value value(addr);
     value.SetCompilerType(objc_id);
     auto object = ValueObjectConstResult::Create(
         exception_sp->GetTargetSP().get(), value, ConstString(name));

source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

AppleObjCRuntimeV2::UpdateISAToDescriptorMapDynamic(
   ExecutionContext exe_ctx;
 
   ThreadSP thread_sp = process->GetThreadList().GetExpressionExecutionThread();
 
   if (!thread_sp)
     return DescriptorMapUpdateResult::Fail();
 
   thread_sp->CalculateExecutionContext(exe_ctx);
-  ClangASTContext *ast = process->GetTarget().GetScratchClangASTContext();
+  auto *ast = ClangASTContext::GetScratch(process->GetTarget());
 
   if (!ast)
     return DescriptorMapUpdateResult::Fail();
 
   Address function_address;
 
   DiagnosticManager diagnostics;
 
AppleObjCRuntimeV2::UpdateISAToDescriptorMapSharedCache() {
   ExecutionContext exe_ctx;
 
   ThreadSP thread_sp = process->GetThreadList().GetExpressionExecutionThread();
 
   if (!thread_sp)
     return DescriptorMapUpdateResult::Fail();
 
   thread_sp->CalculateExecutionContext(exe_ctx);
-  ClangASTContext *ast = process->GetTarget().GetScratchClangASTContext();
+  auto *ast = ClangASTContext::GetScratch(process->GetTarget());
 
   if (!ast)
     return DescriptorMapUpdateResult::Fail();
 
   Address function_address;
 
   DiagnosticManager diagnostics;
 

  public:
   ObjCExceptionRecognizedStackFrame(StackFrameSP frame_sp) {
     ThreadSP thread_sp = frame_sp->GetThread();
     ProcessSP process_sp = thread_sp->GetProcess();
 
     const lldb::ABISP &abi = process_sp->GetABI();
     if (!abi) return;
 
-    CompilerType voidstar = process_sp->GetTarget()
-                                .GetScratchClangASTContext()
+    CompilerType voidstar = ClangASTContext::GetScratch(process_sp->GetTarget())
                                 ->GetBasicType(lldb::eBasicTypeVoid)
                                 .GetPointerType();
 
     ValueList args;
     Value input_value;
     input_value.SetCompilerType(voidstar);
     args.PushValue(input_value);
 

source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp

if (vtable_handler->InitializeVTableSymbols()) {
     // grab that address, and
     // feed it into ReadRegions.  Of course, our friend the ABI will get the
     // values for us.
     ExecutionContext exe_ctx(context->exe_ctx_ref);
     Process *process = exe_ctx.GetProcessPtr();
     const ABI *abi = process->GetABI().get();
 
     ClangASTContext *clang_ast_context =
-        process->GetTarget().GetScratchClangASTContext();
+        ClangASTContext::GetScratch(process->GetTarget());
     ValueList argument_values;
     Value input_value;
     CompilerType clang_void_ptr_type =
         clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
 
     input_value.SetValueType(Value::eValueTypeScalar);
     // input_value.SetContext (Value::eContextTypeClangType,
     // clang_void_ptr_type);
if (!m_impl_code) {
       } else {
         if (log)
           log->Printf("No method lookup implementation code.");
         return LLDB_INVALID_ADDRESS;
       }
 
       // Next make the runner function for our implementation utility function.
       ClangASTContext *clang_ast_context =
-          thread.GetProcess()->GetTarget().GetScratchClangASTContext();
+          ClangASTContext::GetScratch(thread.GetProcess()->GetTarget());
       CompilerType clang_void_ptr_type =
           clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
       Status error;
 
       impl_function_caller = m_impl_code->MakeFunctionCaller(
           clang_void_ptr_type, dispatch_values, thread_sp, error);
       if (error.Fail()) {
         if (log)
if (found_it) {
     ProcessSP process_sp(thread.CalculateProcess());
     if (process_sp)
       abi = process_sp->GetABI().get();
     if (abi == nullptr)
       return ret_plan_sp;
 
     TargetSP target_sp(thread.CalculateTarget());
 
-    ClangASTContext *clang_ast_context = target_sp->GetScratchClangASTContext();
+    auto *clang_ast_context = ClangASTContext::GetScratch(*target_sp);
     ValueList argument_values;
     Value void_ptr_value;
     CompilerType clang_void_ptr_type =
         clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
     void_ptr_value.SetValueType(Value::eValueTypeScalar);
     // void_ptr_value.SetContext (Value::eContextTypeClangType,
     // clang_void_ptr_type);
     void_ptr_value.SetCompilerType(clang_void_ptr_type);

source/Plugins/Platform/POSIX/PlatformPOSIX.cpp

if (!dlopen_utility_func_up->Install(diagnostics, exe_ctx)) {
     return nullptr;
   }
 
   Value value;
   ValueList arguments;
   FunctionCaller *do_dlopen_function = nullptr;
 
   // Fetch the clang types we will need:
-  ClangASTContext *ast = process->GetTarget().GetScratchClangASTContext();
+  auto *ast = ClangASTContext::GetScratch(process->GetTarget());
 
   CompilerType clang_void_pointer_type
       = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
   CompilerType clang_char_pointer_type
         = ast->GetBasicType(eBasicTypeChar).GetPointerType();
 
   // We are passing four arguments, the basename, the list of places to look,
   // a buffer big enough for all the path + name combos, and
uint32_t PlatformPOSIX::DoLoadImage(lldb_private::Process *process,
   options.SetUnwindOnError(true);
   options.SetTrapExceptions(false); // dlopen can't throw exceptions, so
                                     // don't do the work to trap them.
   options.SetTimeout(process->GetUtilityExpressionTimeout());
   options.SetIsForUtilityExpr(true);
 
   Value return_value;
   // Fetch the clang types we will need:
-  ClangASTContext *ast = process->GetTarget().GetScratchClangASTContext();
+  auto *ast = ClangASTContext::GetScratch(process->GetTarget());
 
   CompilerType clang_void_pointer_type
       = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
 
   return_value.SetCompilerType(clang_void_pointer_type);
   
   ExpressionResults results = do_dlopen_function->ExecuteFunction(
       exe_ctx, &func_args_addr, options, diagnostics, return_value);

source/Plugins/Process/Utility/InferiorCallPOSIX.cpp

if (sc_list.GetContextAtIndex(0, sc)) {
           prot_arg |= PROT_READ;
         if (prot & eMmapProtWrite)
           prot_arg |= PROT_WRITE;
       }
 
       AddressRange mmap_range;
       if (sc.GetAddressRange(range_scope, 0, use_inline_block_range,
                              mmap_range)) {
-        ClangASTContext *clang_ast_context =
-            process->GetTarget().GetScratchClangASTContext();
+        auto *clang_ast_context = ClangASTContext::GetScratch(process->GetTarget());
         CompilerType clang_void_ptr_type =
             clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
         const ArchSpec arch = process->GetTarget().GetArchitecture();
         MmapArgList args =
             process->GetTarget().GetPlatform()->GetMmapArgumentList(
                 arch, addr, length, prot_arg, flags, fd, offset);
         lldb::ThreadPlanSP call_plan_sp(
             new ThreadPlanCallFunction(*thread, mmap_range.GetBaseAddress(),
bool lldb_private::InferiorCall(Process *process, const Address *address,
   options.SetStopOthers(true);
   options.SetUnwindOnError(true);
   options.SetIgnoreBreakpoints(true);
   options.SetTryAllThreads(true);
   options.SetDebug(false);
   options.SetTimeout(process->GetUtilityExpressionTimeout());
   options.SetTrapExceptions(trap_exceptions);
 
-  ClangASTContext *clang_ast_context =
-      process->GetTarget().GetScratchClangASTContext();
+  auto *clang_ast_context = ClangASTContext::GetScratch(process->GetTarget());
   CompilerType clang_void_ptr_type =
       clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
   lldb::ThreadPlanSP call_plan_sp(
       new ThreadPlanCallFunction(*thread, *address, clang_void_ptr_type,
                                  llvm::ArrayRef<addr_t>(), options));
   if (call_plan_sp) {
     DiagnosticManager diagnostics;
 

source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp

 AppleGetItemInfoHandler::GetItemInfoReturnInfo
 AppleGetItemInfoHandler::GetItemInfo(Thread &thread, uint64_t item,
                                      addr_t page_to_free,
                                      uint64_t page_to_free_size,
                                      Status &error) {
   lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0);
   ProcessSP process_sp(thread.CalculateProcess());
   TargetSP target_sp(thread.CalculateTarget());
-  ClangASTContext *clang_ast_context = target_sp->GetScratchClangASTContext();
+  auto *clang_ast_context = ClangASTContext::GetScratch(*target_sp);
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME));
 
   GetItemInfoReturnInfo return_value;
   return_value.item_buffer_ptr = LLDB_INVALID_ADDRESS;
   return_value.item_buffer_size = 0;
 
   error.Clear();
 

source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp

if (!m_get_pending_items_impl_code) {
       } else {
         if (log)
           log->Printf("No pending-items introspection code found.");
         return LLDB_INVALID_ADDRESS;
       }
 
       // Next make the runner function for our implementation utility function.
       Status error;
-      ClangASTContext *clang_ast_context =
-          thread.GetProcess()->GetTarget().GetScratchClangASTContext();
+      auto *clang_ast_context =
+          ClangASTContext::GetScratch(thread.GetProcess()->GetTarget());
       CompilerType get_pending_items_return_type =
           clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
       get_pending_items_caller =
           m_get_pending_items_impl_code->MakeFunctionCaller(
               get_pending_items_return_type, get_pending_items_arglist,
               thread_sp, error);
       if (error.Fail() || get_pending_items_caller == nullptr) {
         if (log)

 AppleGetPendingItemsHandler::GetPendingItemsReturnInfo
 AppleGetPendingItemsHandler::GetPendingItems(Thread &thread, addr_t queue,
                                              addr_t page_to_free,
                                              uint64_t page_to_free_size,
                                              Status &error) {
   lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0);
   ProcessSP process_sp(thread.CalculateProcess());
   TargetSP target_sp(thread.CalculateTarget());
-  ClangASTContext *clang_ast_context = target_sp->GetScratchClangASTContext();
+  auto *clang_ast_context = ClangASTContext::GetScratch(*target_sp);
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME));
 
   GetPendingItemsReturnInfo return_value;
   return_value.items_buffer_ptr = LLDB_INVALID_ADDRESS;
   return_value.items_buffer_size = 0;
   return_value.count = 0;
 
   error.Clear();

source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp

if (!m_get_queues_impl_code_up) {
           log->Printf("No queues introspection code found.");
           diagnostics.Dump(log);
         }
         return LLDB_INVALID_ADDRESS;
       }
     }
 
     // Next make the runner function for our implementation utility function.
-    ClangASTContext *clang_ast_context =
-        thread.GetProcess()->GetTarget().GetScratchClangASTContext();
+    auto *clang_ast_context =
+        ClangASTContext::GetScratch(thread.GetProcess()->GetTarget());
     CompilerType get_queues_return_type =
         clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
     Status error;
     get_queues_caller = m_get_queues_impl_code_up->MakeFunctionCaller(
         get_queues_return_type, get_queues_arglist, thread_sp, error);
     if (error.Fail() || get_queues_caller == nullptr) {
       if (log)
         log->Printf(

 
 AppleGetQueuesHandler::GetQueuesReturnInfo
 AppleGetQueuesHandler::GetCurrentQueues(Thread &thread, addr_t page_to_free,
                                         uint64_t page_to_free_size,
                                         Status &error) {
   lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0);
   ProcessSP process_sp(thread.CalculateProcess());
   TargetSP target_sp(thread.CalculateTarget());
-  ClangASTContext *clang_ast_context = target_sp->GetScratchClangASTContext();
+  auto *clang_ast_context = ClangASTContext::GetScratch(*target_sp);
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME));
 
   GetQueuesReturnInfo return_value;
   return_value.queues_buffer_ptr = LLDB_INVALID_ADDRESS;
   return_value.queues_buffer_size = 0;
   return_value.count = 0;
 
   error.Clear();

source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp

if (!m_get_thread_item_info_impl_code) {
       } else {
         if (log)
           log->Printf("No get-thread-item-info introspection code found.");
         return LLDB_INVALID_ADDRESS;
       }
 
       // Also make the FunctionCaller for this UtilityFunction:
 
-      ClangASTContext *clang_ast_context =
-          thread.GetProcess()->GetTarget().GetScratchClangASTContext();
+      auto *clang_ast_context =
+          ClangASTContext::GetScratch(thread.GetProcess()->GetTarget());
       CompilerType get_thread_item_info_return_type =
           clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
 
       get_thread_item_info_caller =
           m_get_thread_item_info_impl_code->MakeFunctionCaller(
               get_thread_item_info_return_type, get_thread_item_info_arglist,
               thread_sp, error);
       if (error.Fail() || get_thread_item_info_caller == nullptr) {

 AppleGetThreadItemInfoHandler::GetThreadItemInfo(Thread &thread,
                                                  tid_t thread_id,
                                                  addr_t page_to_free,
                                                  uint64_t page_to_free_size,
                                                  Status &error) {
   lldb::StackFrameSP thread_cur_frame = thread.GetStackFrameAtIndex(0);
   ProcessSP process_sp(thread.CalculateProcess());
   TargetSP target_sp(thread.CalculateTarget());
-  ClangASTContext *clang_ast_context = target_sp->GetScratchClangASTContext();
+  auto *clang_ast_context = ClangASTContext::GetScratch(*target_sp);
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_SYSTEM_RUNTIME));
 
   GetThreadItemInfoReturnInfo return_value;
   return_value.item_buffer_ptr = LLDB_INVALID_ADDRESS;
   return_value.item_buffer_size = 0;
 
   error.Clear();
 

source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp

#if 0
             uint16_t version = m_process->GetTarget().ReadUnsignedIntegerFromMemory (dti_struct_addr, false, 2, UINT16_MAX, error);
             if (error.Success() && dti_version != UINT16_MAX)
             {
                 dti_version = version;
             }
         }
 #endif
 
-    ClangASTContext *ast_ctx =
-        m_process->GetTarget().GetScratchClangASTContext();
+    auto *ast_ctx = ClangASTContext::GetScratch(m_process->GetTarget());
     if (ast_ctx->getASTContext() &&
         m_dispatch_tsd_indexes_addr != LLDB_INVALID_ADDRESS) {
       CompilerType uint16 =
           ast_ctx->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 16);
       CompilerType dispatch_tsd_indexes_s = ast_ctx->CreateRecordType(
           nullptr, lldb::eAccessPublic, "__lldb_dispatch_tsd_indexes_s",
           clang::TTK_Struct, lldb::eLanguageTypeC);
 

source/Symbol/ClangASTContext.cpp

static ClangASTMap &GetASTMap() {
   static ClangASTMap *g_map_ptr = nullptr;
   static llvm::once_flag g_once_flag;
   llvm::call_once(g_once_flag, []() {
     g_map_ptr = new ClangASTMap(); // leaked on purpose to avoid spins
   });
   return *g_map_ptr;
 }
 
+ClangASTContext *ClangASTContext::GetScratch(Target &target,
+                                             bool create_on_demand) {
+  return llvm::cast_or_null<ClangASTContext>(
+      target.GetScratchTypeSystemForLanguage(nullptr, eLanguageTypeC,
+                                             create_on_demand));
+}
+
 bool ClangASTContext::IsOperator(const char *name,
                                  clang::OverloadedOperatorKind &op_kind) {
   if (name == nullptr || name[0] == '\0')
     return false;
 
 #define OPERATOR_PREFIX "operator"
 #define OPERATOR_PREFIX_LENGTH (sizeof(OPERATOR_PREFIX) - 1)
 

source/Target/Target.cpp

 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Core/SourceManager.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Core/StructuredDataImpl.h"
 #include "lldb/Core/ValueObject.h"
+#include "lldb/Expression/ExpressionVariable.h"
 #include "lldb/Expression/REPL.h"
 #include "lldb/Expression/UserExpression.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/PosixApi.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/OptionGroupWatchpoint.h"
 #include "lldb/Interpreter/OptionValues.h"
 #include "lldb/Interpreter/Property.h"
-#include "lldb/Symbol/ClangASTContext.h"
 #include "lldb/Symbol/ClangASTImporter.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Symbol/Symbol.h"
 #include "lldb/Target/Language.h"
 #include "lldb/Target/LanguageRuntime.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/SectionLoadList.h"
Target::GetUtilityFunctionForLanguage(const char *text,
   if (!utility_fn)
     error.SetErrorStringWithFormat(
         "Could not create an expression for language %s",
         Language::GetNameForLanguageType(language));
 
   return utility_fn;
 }
 
-ClangASTContext *Target::GetScratchClangASTContext(bool create_on_demand) {
-  if (m_valid) {
-    if (TypeSystem *type_system = GetScratchTypeSystemForLanguage(
-            nullptr, eLanguageTypeC, create_on_demand))
-      return llvm::dyn_cast<ClangASTContext>(type_system);
-  }
-  return nullptr;
-}
-
 ClangASTImporterSP Target::GetClangASTImporter() {
   if (m_valid) {
     if (!m_ast_importer_sp) {
       m_ast_importer_sp = std::make_shared<ClangASTImporter>();
     }
     return m_ast_importer_sp;
   }
   return ClangASTImporterSP();