TypeSystem is now a plugin interface and removed any "ClangASTContext &Class::GetClangASTContext()" functions.

This cleans up type systems to be more pluggable. Prior to this we had issues:
- Module, SymbolFile, and many others has "ClangASTContext &GetClangASTContext()" functions. All have been switched over to use "TypeSystem *GetTypeSystemForLanguage()"
- Cleaned up any places that were using the GetClangASTContext() functions to use TypeSystem
- Cleaned up Module so that it no longer has dedicated type system member variables:
    lldb::ClangASTContextUP     m_ast;          ///< The Clang AST context for this module.
    lldb::GoASTContextUP        m_go_ast;       ///< The Go AST context for this module.
    
    Now we have a type system map:
    
    typedef std::map<lldb::LanguageType, lldb::TypeSystemSP> TypeSystemMap;
    TypeSystemMap               m_type_system_map;    ///< A map of any type systems associated with this module
- Many places in code were using ClangASTContext static functions to place with CompilerType objects and add modifiers (const, volatile, restrict) and to make typedefs, L and R value references and more. These have been made into CompilerType functions that are abstract:

    class CompilerType
    {
    ...
    
    //----------------------------------------------------------------------
    // Return a new CompilerType that is a L value reference to this type if
    // this type is valid and the type system supports L value references,
    // else return an invalid type.
    //----------------------------------------------------------------------
    CompilerType
    GetLValueReferenceType () const;

    //----------------------------------------------------------------------
    // Return a new CompilerType that is a R value reference to this type if
    // this type is valid and the type system supports R value references,
    // else return an invalid type.
    //----------------------------------------------------------------------
    CompilerType
    GetRValueReferenceType () const;

    //----------------------------------------------------------------------
    // Return a new CompilerType adds a const modifier to this type if
    // this type is valid and the type system supports const modifiers,
    // else return an invalid type.
    //----------------------------------------------------------------------
    CompilerType
    AddConstModifier () const;

    //----------------------------------------------------------------------
    // Return a new CompilerType adds a volatile modifier to this type if
    // this type is valid and the type system supports volatile modifiers,
    // else return an invalid type.
    //----------------------------------------------------------------------
    CompilerType
    AddVolatileModifier () const;

    //----------------------------------------------------------------------
    // Return a new CompilerType adds a restrict modifier to this type if
    // this type is valid and the type system supports restrict modifiers,
    // else return an invalid type.
    //----------------------------------------------------------------------
    CompilerType
    AddRestrictModifier () const;

    //----------------------------------------------------------------------
    // Create a typedef to this type using "name" as the name of the typedef
    // this type is valid and the type system supports typedefs, else return
    // an invalid type.
    //----------------------------------------------------------------------
    CompilerType
    CreateTypedef (const char *name, const CompilerDeclContext &decl_ctx) const;
    
    };
    
Other changes include:
- Removed "CompilerType TypeSystem::GetIntTypeFromBitSize(...)" and CompilerType TypeSystem::GetFloatTypeFromBitSize(...) and replaced it with "CompilerType TypeSystem::GetBuiltinTypeForEncodingAndBitSize(lldb::Encoding encoding, size_t bit_size);"
- Fixed code in Type.h to not request the full type for a type for no good reason, just request the forward type and let the type expand as needed

llvm-svn: 247953

Author: Greg Clayton

lldb/include/lldb/Core/Module.h

@@ -944,9 +944,6 @@ class Module :
     bool
     GetIsDynamicLinkEditor ();
 
-    ClangASTContext &
-    GetClangASTContext ();
-
     TypeSystem *
     GetTypeSystemForLanguage (lldb::LanguageType language);
 
@@ -1101,6 +1098,7 @@ class Module :
                                   bool &match_name_after_lookup);
 
 protected:
+    typedef std::map<lldb::LanguageType, lldb::TypeSystemSP> TypeSystemMap;
     //------------------------------------------------------------------
     // Member Variables
     //------------------------------------------------------------------
@@ -1119,15 +1117,13 @@ class Module :
     lldb::SymbolVendorUP        m_symfile_ap;   ///< A pointer to the symbol vendor for this module.
     std::vector<lldb::SymbolVendorUP> m_old_symfiles; ///< If anyone calls Module::SetSymbolFileFileSpec() and changes the symbol file,
                                                       ///< we need to keep all old symbol files around in case anyone has type references to them
-    lldb::ClangASTContextUP     m_ast;          ///< The Clang AST context for this module.
-    lldb::GoASTContextUP        m_go_ast;       ///< The Go AST context for this module.
+    TypeSystemMap               m_type_system_map;    ///< A map of any type systems associated with this module
     PathMappingList             m_source_mappings; ///< Module specific source remappings for when you have debug info for a module that doesn't match where the sources currently are
     lldb::SectionListUP         m_sections_ap; ///< Unified section list for module that is used by the ObjectFile and and ObjectFile instances for the debug info
 
     std::atomic<bool>           m_did_load_objfile;
     std::atomic<bool>           m_did_load_symbol_vendor;
     std::atomic<bool>           m_did_parse_uuid;
-    std::atomic<bool>           m_did_init_ast;
     mutable bool                m_file_has_changed:1,
                                 m_first_file_changed_log:1;   /// See if the module was modified after it was initially opened.
 

lldb/include/lldb/Core/PluginManager.h

@@ -419,6 +419,22 @@ class PluginManager
     static InstrumentationRuntimeCreateInstance
     GetInstrumentationRuntimeCreateCallbackForPluginName (const ConstString &name);
 
+    //------------------------------------------------------------------
+    // TypeSystem
+    //------------------------------------------------------------------
+    static bool
+    RegisterPlugin (const ConstString &name,
+                    const char *description,
+                    TypeSystemCreateInstance create_callback);
+
+    static bool
+    UnregisterPlugin (TypeSystemCreateInstance create_callback);
+
+    static TypeSystemCreateInstance
+    GetTypeSystemCreateCallbackAtIndex (uint32_t idx);
+
+    static TypeSystemCreateInstance
+    GetTypeSystemCreateCallbackForPluginName (const ConstString &name);
 
     //------------------------------------------------------------------
     // Some plug-ins might register a DebuggerInitializeCallback

lldb/include/lldb/Symbol/ClangASTContext.h

@@ -55,7 +55,28 @@ class ClangASTContext : public TypeSystem
     ClangASTContext (const char *triple = NULL);
 
     ~ClangASTContext() override;
-    
+
+    //------------------------------------------------------------------
+    // PluginInterface functions
+    //------------------------------------------------------------------
+    ConstString
+    GetPluginName() override;
+
+    uint32_t
+    GetPluginVersion() override;
+
+    static ConstString
+    GetPluginNameStatic ();
+
+    static lldb::TypeSystemSP
+    CreateInstance (lldb::LanguageType language, const lldb_private::ArchSpec &arch);
+
+    static void
+    Initialize ();
+
+    static void
+    Terminate ();
+
     static ClangASTContext*
     GetASTContext (clang::ASTContext* ast_ctx);
 
@@ -153,7 +174,7 @@ class ClangASTContext : public TypeSystem
     //------------------------------------------------------------------
     CompilerType
     GetBuiltinTypeForEncodingAndBitSize (lldb::Encoding encoding,
-                                          uint32_t bit_size);
+                                         size_t bit_size) override;
 
     static CompilerType
     GetBuiltinTypeForEncodingAndBitSize (clang::ASTContext *ast,
@@ -448,13 +469,7 @@ class ClangASTContext : public TypeSystem
     //------------------------------------------------------------------
     // Integer type functions
     //------------------------------------------------------------------
-    
-    CompilerType
-    GetIntTypeFromBitSize (size_t bit_size, bool is_signed) override
-    {
-        return GetIntTypeFromBitSize (getASTContext(), bit_size, is_signed);
-    }
-    
+        
     static CompilerType
     GetIntTypeFromBitSize (clang::ASTContext *ast,
                            size_t bit_size, bool is_signed);
@@ -471,12 +486,6 @@ class ClangASTContext : public TypeSystem
     //------------------------------------------------------------------
     // Floating point functions
     //------------------------------------------------------------------
-    
-    CompilerType
-    GetFloatTypeFromBitSize (size_t bit_size) override
-    {
-        return GetFloatTypeFromBitSize (getASTContext(), bit_size);
-    }
 
     static CompilerType
     GetFloatTypeFromBitSize (clang::ASTContext *ast,
@@ -673,7 +682,10 @@ class ClangASTContext : public TypeSystem
 
     bool
     IsVoidType (void *type) override;
-    
+
+    bool
+    SupportsLanguage (lldb::LanguageType language) override;
+
     static bool
     GetCXXClassName (const CompilerType& type, std::string &class_name);
 
@@ -710,15 +722,6 @@ class ClangASTContext : public TypeSystem
     // Creating related types
     //----------------------------------------------------------------------
 
-    static CompilerType
-    AddConstModifier (const CompilerType& type);
-    
-    static CompilerType
-    AddRestrictModifier (const CompilerType& type);
-    
-    static CompilerType
-    AddVolatileModifier (const CompilerType& type);
-    
     // Using the current type, create a new typedef to that type using "typedef_name"
     // as the name and "decl_ctx" as the decl context.
     static CompilerType
@@ -752,9 +755,6 @@ class ClangASTContext : public TypeSystem
     TypeMemberFunctionImpl
     GetMemberFunctionAtIndex (void *type, size_t idx) override;
 
-    static CompilerType
-    GetLValueReferenceType (const CompilerType& type);
-    
     CompilerType
     GetNonReferenceType (void *type) override;
 
@@ -763,10 +763,25 @@ class ClangASTContext : public TypeSystem
 
     CompilerType
     GetPointerType (void *type) override;
-    
-    static CompilerType
-    GetRValueReferenceType (const CompilerType& type);
-    
+
+    CompilerType
+    GetLValueReferenceType (void *type) override;
+
+    CompilerType
+    GetRValueReferenceType (void *type) override;
+
+    CompilerType
+    AddConstModifier (void *type) override;
+
+    CompilerType
+    AddVolatileModifier (void *type) override;
+
+    CompilerType
+    AddRestrictModifier (void *type) override;
+
+    CompilerType
+    CreateTypedef (void *type, const char *name, const CompilerDeclContext &decl_ctx) override;
+
     // If the current object represents a typedef type, get the underlying type
     CompilerType
     GetTypedefedType (void *type) override;
@@ -804,7 +819,10 @@ class ClangASTContext : public TypeSystem
 
     uint32_t
     GetNumChildren (void *type, bool omit_empty_base_classes) override;
-    
+
+    CompilerType
+    GetBuiltinTypeByName (const ConstString &name) override;
+
     lldb::BasicType
     GetBasicTypeEnumeration (void *type) override;
 

lldb/include/lldb/Symbol/CompilerType.h

@@ -272,15 +272,75 @@ class CompilerType
     TypeMemberFunctionImpl
     GetMemberFunctionAtIndex (size_t idx);
 
+    //----------------------------------------------------------------------
+    // If this type is a reference to a type (L value or R value reference),
+    // return a new type with the reference removed, else return the current
+    // type itself.
+    //----------------------------------------------------------------------
     CompilerType
     GetNonReferenceType () const;
 
+    //----------------------------------------------------------------------
+    // If this type is a pointer type, return the type that the pointer
+    // points to, else return an invalid type.
+    //----------------------------------------------------------------------
     CompilerType
     GetPointeeType () const;
 
+    //----------------------------------------------------------------------
+    // Return a new CompilerType that is a pointer to this type
+    //----------------------------------------------------------------------
     CompilerType
     GetPointerType () const;
 
+    //----------------------------------------------------------------------
+    // Return a new CompilerType that is a L value reference to this type if
+    // this type is valid and the type system supports L value references,
+    // else return an invalid type.
+    //----------------------------------------------------------------------
+    CompilerType
+    GetLValueReferenceType () const;
+
+    //----------------------------------------------------------------------
+    // Return a new CompilerType that is a R value reference to this type if
+    // this type is valid and the type system supports R value references,
+    // else return an invalid type.
+    //----------------------------------------------------------------------
+    CompilerType
+    GetRValueReferenceType () const;
+
+    //----------------------------------------------------------------------
+    // Return a new CompilerType adds a const modifier to this type if
+    // this type is valid and the type system supports const modifiers,
+    // else return an invalid type.
+    //----------------------------------------------------------------------
+    CompilerType
+    AddConstModifier () const;
+
+    //----------------------------------------------------------------------
+    // Return a new CompilerType adds a volatile modifier to this type if
+    // this type is valid and the type system supports volatile modifiers,
+    // else return an invalid type.
+    //----------------------------------------------------------------------
+    CompilerType
+    AddVolatileModifier () const;
+
+    //----------------------------------------------------------------------
+    // Return a new CompilerType adds a restrict modifier to this type if
+    // this type is valid and the type system supports restrict modifiers,
+    // else return an invalid type.
+    //----------------------------------------------------------------------
+    CompilerType
+    AddRestrictModifier () const;
+
+    //----------------------------------------------------------------------
+    // Create a typedef to this type using "name" as the name of the typedef
+    // this type is valid and the type system supports typedefs, else return
+    // an invalid type.
+    //----------------------------------------------------------------------
+    CompilerType
+    CreateTypedef (const char *name, const CompilerDeclContext &decl_ctx) const;
+
     // If the current object represents a typedef type, get the underlying type
     CompilerType
     GetTypedefedType () const;

lldb/include/lldb/Symbol/GoASTContext.h

@@ -27,6 +27,28 @@ class GoASTContext : public TypeSystem
     GoASTContext();
     ~GoASTContext();
 
+    //------------------------------------------------------------------
+    // PluginInterface functions
+    //------------------------------------------------------------------
+    ConstString
+    GetPluginName() override;
+
+    uint32_t
+    GetPluginVersion() override;
+
+    static ConstString
+    GetPluginNameStatic ();
+
+    static lldb::TypeSystemSP
+    CreateInstance (lldb::LanguageType language, const lldb_private::ArchSpec &arch);
+
+    static void
+    Initialize ();
+
+    static void
+    Terminate ();
+    
+
     DWARFASTParser *GetDWARFParser() override;
 
     void
@@ -101,7 +123,7 @@ class GoASTContext : public TypeSystem
     CompilerType CreateBaseType(int go_kind, const ConstString &type_name_const_str, uint64_t byte_size);
 
     // For interface, map, chan.
-    CompilerType CreateTypedef(int kind, const ConstString &name, CompilerType impl);
+    CompilerType CreateTypedefType(int kind, const ConstString &name, CompilerType impl);
 
     CompilerType CreateVoidType(const ConstString &name);
     CompilerType CreateFunctionType(const lldb_private::ConstString &name, CompilerType *params, size_t params_count,
@@ -124,37 +146,39 @@ class GoASTContext : public TypeSystem
     static bool IsDirectIface(uint8_t kind);
     static bool IsPointerKind(uint8_t kind);
 
-    virtual bool IsArrayType(void *type, CompilerType *element_type, uint64_t *size, bool *is_incomplete) override;
+    bool IsArrayType(void *type, CompilerType *element_type, uint64_t *size, bool *is_incomplete) override;
 
-    virtual bool IsAggregateType(void *type) override;
+    bool IsAggregateType(void *type) override;
 
-    virtual bool IsCharType(void *type) override;
+    bool IsCharType(void *type) override;
 
-    virtual bool IsCompleteType(void *type) override;
+    bool IsCompleteType(void *type) override;
 
-    virtual bool IsDefined(void *type) override;
+    bool IsDefined(void *type) override;
 
-    virtual bool IsFloatingPointType(void *type, uint32_t &count, bool &is_complex) override;
+    bool IsFloatingPointType(void *type, uint32_t &count, bool &is_complex) override;
 
-    virtual bool IsFunctionType(void *type, bool *is_variadic_ptr = NULL) override;
+    bool IsFunctionType(void *type, bool *is_variadic_ptr = NULL) override;
 
-    virtual size_t GetNumberOfFunctionArguments(void *type) override;
+    size_t GetNumberOfFunctionArguments(void *type) override;
 
-    virtual CompilerType GetFunctionArgumentAtIndex(void *type, const size_t index) override;
+    CompilerType GetFunctionArgumentAtIndex(void *type, const size_t index) override;
 
-    virtual bool IsFunctionPointerType(void *type) override;
+    bool IsFunctionPointerType(void *type) override;
 
-    virtual bool IsIntegerType(void *type, bool &is_signed) override;
+    bool IsIntegerType(void *type, bool &is_signed) override;
 
-    virtual bool IsPossibleDynamicType(void *type,
+    bool IsPossibleDynamicType(void *type,
                                        CompilerType *target_type, // Can pass NULL
                                        bool check_cplusplus, bool check_objc) override;
 
-    virtual bool IsPointerType(void *type, CompilerType *pointee_type = NULL) override;
+    bool IsPointerType(void *type, CompilerType *pointee_type = NULL) override;
+
+    bool IsScalarType(void *type) override;
 
-    virtual bool IsScalarType(void *type) override;
+    bool IsVoidType(void *type) override;
 
-    virtual bool IsVoidType(void *type) override;
+    bool SupportsLanguage (lldb::LanguageType language) override;
 
     //----------------------------------------------------------------------
     // Type Completion
@@ -217,9 +241,9 @@ class GoASTContext : public TypeSystem
     virtual uint32_t GetNumChildren(void *type, bool omit_empty_base_classes) override;
 
     virtual lldb::BasicType GetBasicTypeEnumeration(void *type) override;
-    virtual CompilerType GetIntTypeFromBitSize (size_t bit_size, bool is_signed) override;
-    virtual CompilerType GetFloatTypeFromBitSize (size_t bit_size) override;
 
+    virtual CompilerType GetBuiltinTypeForEncodingAndBitSize (lldb::Encoding encoding,
+                                                              size_t bit_size) override;
 
     virtual uint32_t GetNumFields(void *type) override;
 

lldb/include/lldb/Symbol/SymbolFile.h

@@ -147,8 +147,6 @@ class SymbolFile :
     virtual size_t          GetTypes (lldb_private::SymbolContextScope *sc_scope,
                                       uint32_t type_mask,
                                       lldb_private::TypeList &type_list) = 0;
-    virtual ClangASTContext &
-                            GetClangASTContext ();
 
     virtual lldb_private::TypeSystem *
                             GetTypeSystemForLanguage (lldb::LanguageType language);