Merge pull request #11042 from swiftlang/jepa-stable2

[stable/21.x] Cherry-pick a few more overlooked changes from previous stable branch

Author: AnthonyLatsis

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

@@ -9284,16 +9284,17 @@ bool SwiftASTContext::GetCompileUnitImportsImpl(
       validate_pcm = true;
 #endif
     }
-    
-    auto &pp_opts = m_clangimporter->getClangPreprocessor()
-      .getPreprocessorOpts();
-    pp_opts.DisablePCHOrModuleValidation =
-        validate_pcm ? clang::DisableValidationForModuleKind::None
-                     : clang::DisableValidationForModuleKind::All;
-    pp_opts.ModulesCheckRelocated = validate_pcm;
-
-    LOG_PRINTF(GetLog(LLDBLog::Types), "PCM validation is %s",
-               validate_pcm ? "disabled" : "enabled");
+
+    const auto &pp_opts =
+        m_clangimporter->getClangPreprocessor().getPreprocessorOpts();
+    // rdar://155232969
+    // pp_opts.DisablePCHOrModuleValidation =
+    //     validate_pcm ? clang::DisableValidationForModuleKind::None
+    //                  : clang::DisableValidationForModuleKind::All;
+    // pp_opts.ModulesCheckRelocated = validate_pcm;
+
+    if (!validate_pcm)
+      LOG_PRINTF(GetLog(LLDBLog::Types), "PCM validation cannot be disabled");
   }
 
   LOG_PRINTF(GetLog(LLDBLog::Types), "Importing dependencies of current CU");

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

@@ -16,6 +16,7 @@
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Symbol/CompileUnit.h"
+#include "llvm/Support/Error.h"
 #include <lldb/lldb-enumerations.h>
 #include <llvm/ADT/StringRef.h>
 
@@ -207,6 +208,13 @@ bool TypeSystemSwift::GetPtrAuthAddressDiversity(
   return false;
 }
 
+llvm::Expected<CompilerType> TypeSystemSwift::GetDereferencedType(
+    lldb::opaque_compiler_type_t type, ExecutionContext *exe_ctx,
+    std::string &deref_name, uint32_t &deref_byte_size,
+    int32_t &deref_byte_offset, ValueObject *valobj, uint64_t &language_flags) {
+  return llvm::createStringError("Swift types cannot be dereferenced");
+}
+
 namespace llvm {
 llvm::raw_ostream &
 operator<<(llvm::raw_ostream &os,

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

@@ -350,6 +350,12 @@ class TypeSystemSwift : public TypeSystem {
   unsigned GetPtrAuthDiscriminator(lldb::opaque_compiler_type_t type) override;
   bool GetPtrAuthAddressDiversity(lldb::opaque_compiler_type_t type) override;
 
+  llvm::Expected<CompilerType>
+  GetDereferencedType(lldb::opaque_compiler_type_t type,
+                      ExecutionContext *exe_ctx, std::string &deref_name,
+                      uint32_t &deref_byte_size, int32_t &deref_byte_offset,
+                      ValueObject *valobj, uint64_t &language_flags) override;
+
   /// \}
 protected:
   /// Used in the logs.