Merge pull request #2065 from adrian-prantl/move-langflags

Move LanguageOptions into TypeSystemSwift (NFC)

Author: adrian-prantl

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

@@ -6559,7 +6559,7 @@ GetExistentialTypeChild(swift::ASTContext *swift_ast_ctx, CompilerType type,
   // The instance for an error existential.
   if (idx == 0 && protocol_info.m_is_errortype) {
     auto raw_pointer = swift_ast_ctx->TheRawPointerType;
-    return {ToCompilerType(raw_pointer.getPointer()), "error_instance"};
+    return {ToCompilerType(raw_pointer.getPointer()), "error"};
   }
 
   // The metatype for a non-class, non-error existential.
@@ -7057,7 +7057,6 @@ CompilerType SwiftASTContext::GetChildCompilerTypeAtIndex(
         child_bitfield_bit_size = 0;
         child_bitfield_bit_offset = 0;
 
-        language_flags |= LanguageFlags::eIgnoreInstancePointerness;
         return superclass_type;
       }
 

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

@@ -125,17 +125,6 @@ class SwiftASTContext : public TypeSystemSwift {
 public:
   typedef std::set<TypeOrDecl, EitherComparator> TypesOrDecls;
 
-  class LanguageFlags {
-  public:
-    enum : uint64_t {
-      eIsIndirectEnumCase = 0x1ULL,
-      eIgnoreInstancePointerness = 0x2ULL
-    };
-
-  private:
-    LanguageFlags() = delete;
-  };
-
   /// Provide the global LLVMContext.
   static llvm::LLVMContext &GetGlobalLLVMContext();
 

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

@@ -97,6 +97,16 @@ class TypeSystemSwift : public TypeSystem {
   static ConstString GetPluginNameStatic();
   /// \}
 
+  class LanguageFlags {
+  public:
+    enum : uint64_t {
+      eIsIndirectEnumCase = 0x1ULL
+    };
+
+  private:
+    LanguageFlags() = delete;
+  };
+
   static LanguageSet GetSupportedLanguagesForTypes();
   virtual SwiftASTContext *GetSwiftASTContext() = 0;
   virtual Module *GetModule() const = 0;