[lldb] Account for renamed ScratchTypeSystemClang for swift

Author: lanza

lldb/source/Plugins/InstrumentationRuntime/SwiftRuntimeReporting/SwiftRuntimeReporting.cpp

@@ -219,7 +219,8 @@ SwiftRuntimeReporting::RetrieveReportData(ExecutionContextRef exe_ctx_ref) {
     return StructuredData::ObjectSP();
 
   // Prepare the argument types: treat all of them as pointers
-  TypeSystemClang *clang_ast_context = TypeSystemClang::GetScratch(target);
+  TypeSystemClang *clang_ast_context =
+      ScratchTypeSystemClang::GetForTarget(target);
   ValueList args;
   Value input_value;
   input_value.SetCompilerType(

lldb/source/Plugins/Language/Swift/SwiftArray.cpp

@@ -141,7 +141,7 @@ SwiftArrayBridgedBufferHandler::SwiftArrayBridgedBufferHandler(
     : SwiftArrayBufferHandler(), m_elem_type(), m_synth_array_sp(),
       m_frontend(nullptr) {
   TypeSystemClang *clang_ast_context =
-        TypeSystemClang::GetScratch(process_sp->GetTarget());
+        ScratchTypeSystemClang::GetForTarget(process_sp->GetTarget());
   if (!clang_ast_context)
     return;
   m_elem_type = clang_ast_context->GetBasicType(
@@ -291,7 +291,7 @@ SwiftArrayBufferHandler::CreateBufferHandler(ValueObject &valobj) {
   if (!valobj.GetTargetSP())
     return nullptr;
   TypeSystemClang *clang_ast_context =
-      TypeSystemClang::GetScratch(*valobj.GetTargetSP());
+      ScratchTypeSystemClang::GetForTarget(*valobj.GetTargetSP());
   if (!clang_ast_context)
     return nullptr;
 

lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp

@@ -322,7 +322,7 @@ bool lldb_private::formatters::swift::StringGuts_SummaryProvider(
 
   if ((discriminator & 0xE0) == 0x40) { // 010xxxxx: Bridged
     TypeSystemClang *clang_ast_context =
-        TypeSystemClang::GetScratch(process->GetTarget());
+        ScratchTypeSystemClang::GetForTarget(process->GetTarget());
     if (!clang_ast_context)
       return false;
 

lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp

@@ -325,7 +325,7 @@ HashedCollectionConfig::CocoaObjectAtAddress(
   if (!process_sp)
     return nullptr;
   TypeSystemClang *clang_ast_context =
-        TypeSystemClang::GetScratch(process_sp->GetTarget());
+        ScratchTypeSystemClang::GetForTarget(process_sp->GetTarget());
   if (!clang_ast_context)
     return nullptr;
   CompilerType id = clang_ast_context->GetBasicType(lldb::eBasicTypeObjCID);

lldb/source/Target/SwiftLanguageRuntime.cpp

@@ -1046,7 +1046,7 @@ void SwiftLanguageRuntime::FindFunctionPointersInCall(
                 ABISP abi_sp(frame.GetThread()->GetProcess()->GetABI());
                 ValueList argument_values;
                 Value input_value;
-                auto clang_ctx = TypeSystemClang::GetScratch(target);
+                auto clang_ctx = ScratchTypeSystemClang::GetForTarget(target);
                 if (!clang_ctx)
                   continue;
 

lldb/source/Target/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -256,7 +256,7 @@ const CompilerType &SwiftLanguageRuntimeImpl::GetBoxMetadataType() {
   static ConstString g_type_name("__lldb_autogen_boxmetadata");
   const bool is_packed = false;
   if (TypeSystemClang *ast_ctx =
-          TypeSystemClang::GetScratch(m_process.GetTarget())) {
+          ScratchTypeSystemClang::GetForTarget(m_process.GetTarget())) {
     CompilerType voidstar =
         ast_ctx->GetBasicType(lldb::eBasicTypeVoid).GetPointerType();
     CompilerType uint32 = ast_ctx->GetIntTypeFromBitSize(32, false);