Author: brucem Date: Tue Sep 22 12:04:24 2015 New Revision: 248288 URL: http://llvm.org/viewvc/llvm-project?rev=248288&view=rev Log: Rename clang_type_t to opaque_compiler_type_t.
Summary: This is no longer related to Clang and is just an opaque pointer to data for a compiler type. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D13039 Modified: lldb/trunk/include/lldb/Expression/ASTDumper.h lldb/trunk/include/lldb/Symbol/ClangASTImporter.h lldb/trunk/include/lldb/lldb-types.h lldb/trunk/source/Commands/CommandObjectMemory.cpp lldb/trunk/source/Expression/ASTDumper.cpp lldb/trunk/source/Expression/ClangASTSource.cpp lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h lldb/trunk/source/Symbol/ClangASTContext.cpp lldb/trunk/source/Symbol/ClangASTImporter.cpp lldb/trunk/source/Symbol/CompilerType.cpp Modified: lldb/trunk/include/lldb/Expression/ASTDumper.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ASTDumper.h?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/include/lldb/Expression/ASTDumper.h (original) +++ lldb/trunk/include/lldb/Expression/ASTDumper.h Tue Sep 22 12:04:24 2015 @@ -26,7 +26,7 @@ public: ASTDumper (clang::DeclContext *decl_ctx); ASTDumper (const clang::Type *type); ASTDumper (clang::QualType type); - ASTDumper (lldb::clang_type_t type); + ASTDumper (lldb::opaque_compiler_type_t type); ASTDumper (const CompilerType &clang_type); const char *GetCString(); Modified: lldb/trunk/include/lldb/Symbol/ClangASTImporter.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTImporter.h?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/include/lldb/Symbol/ClangASTImporter.h (original) +++ lldb/trunk/include/lldb/Symbol/ClangASTImporter.h Tue Sep 22 12:04:24 2015 @@ -96,20 +96,20 @@ public: clang::ASTContext *src_ctx, clang::QualType type); - lldb::clang_type_t + lldb::opaque_compiler_type_t CopyType (clang::ASTContext *dst_ctx, clang::ASTContext *src_ctx, - lldb::clang_type_t type); + lldb::opaque_compiler_type_t type); clang::Decl * CopyDecl (clang::ASTContext *dst_ctx, clang::ASTContext *src_ctx, clang::Decl *decl); - lldb::clang_type_t + lldb::opaque_compiler_type_t DeportType (clang::ASTContext *dst_ctx, clang::ASTContext *src_ctx, - lldb::clang_type_t type); + lldb::opaque_compiler_type_t type); clang::Decl * DeportDecl (clang::ASTContext *dst_ctx, Modified: lldb/trunk/include/lldb/lldb-types.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-types.h?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/include/lldb/lldb-types.h (original) +++ lldb/trunk/include/lldb/lldb-types.h Tue Sep 22 12:04:24 2015 @@ -110,7 +110,7 @@ namespace lldb typedef uint64_t offset_t; typedef int32_t break_id_t; typedef int32_t watch_id_t; - typedef void * clang_type_t; + typedef void * opaque_compiler_type_t; typedef uint64_t queue_id_t; } Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Tue Sep 22 12:04:24 2015 @@ -533,7 +533,7 @@ protected: clang::TypeDecl *tdecl = target->GetPersistentVariables().GetPersistentType(ConstString(lookup_type_name)); if (tdecl) { - clang_ast_type.SetCompilerType(ClangASTContext::GetASTContext(&tdecl->getASTContext()),(const lldb::clang_type_t)tdecl->getTypeForDecl()); + clang_ast_type.SetCompilerType(ClangASTContext::GetASTContext(&tdecl->getASTContext()),(const lldb::opaque_compiler_type_t)tdecl->getTypeForDecl()); } } Modified: lldb/trunk/source/Expression/ASTDumper.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ASTDumper.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Expression/ASTDumper.cpp (original) +++ lldb/trunk/source/Expression/ASTDumper.cpp Tue Sep 22 12:04:24 2015 @@ -75,7 +75,7 @@ ASTDumper::ASTDumper (clang::QualType ty m_dump = type.getAsString(); } -ASTDumper::ASTDumper (lldb::clang_type_t type) +ASTDumper::ASTDumper (lldb::opaque_compiler_type_t type) { m_dump = clang::QualType::getFromOpaquePtr(type).getAsString(); } Modified: lldb/trunk/source/Expression/ClangASTSource.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangASTSource.cpp (original) +++ lldb/trunk/source/Expression/ClangASTSource.cpp Tue Sep 22 12:04:24 2015 @@ -401,7 +401,7 @@ ClangASTSource::GetCompleteObjCInterface return NULL; TypeFromUser complete_type = TypeFromUser(complete_type_sp->GetFullCompilerType ()); - lldb::clang_type_t complete_opaque_type = complete_type.GetOpaqueQualType(); + lldb::opaque_compiler_type_t complete_opaque_type = complete_type.GetOpaqueQualType(); if (!complete_opaque_type) return NULL; Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original) +++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Tue Sep 22 12:04:24 2015 @@ -1614,11 +1614,11 @@ ClangExpressionDeclMap::FindExternalVisi } } -//static clang_type_t +//static opaque_compiler_type_t //MaybePromoteToBlockPointerType //( // ASTContext *ast_context, -// clang_type_t candidate_type +// opaque_compiler_type_t candidate_type //) //{ // if (!candidate_type) @@ -1946,7 +1946,7 @@ ClangExpressionDeclMap::ResolveUnknownTy QualType var_type = var_decl->getType(); TypeFromParser parser_type(var_type.getAsOpaquePtr(), ClangASTContext::GetASTContext(&var_decl->getASTContext())); - lldb::clang_type_t copied_type = m_ast_importer->CopyType(scratch_ast_context->getASTContext(), &var_decl->getASTContext(), var_type.getAsOpaquePtr()); + lldb::opaque_compiler_type_t copied_type = m_ast_importer->CopyType(scratch_ast_context->getASTContext(), &var_decl->getASTContext(), var_type.getAsOpaquePtr()); if (!copied_type) { Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original) +++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Tue Sep 22 12:04:24 2015 @@ -323,8 +323,8 @@ public: protected: typedef llvm::DenseMap<const DWARFDebugInfoEntry *, lldb_private::Type *> DIEToTypePtr; typedef llvm::DenseMap<const DWARFDebugInfoEntry *, lldb::VariableSP> DIEToVariableSP; - typedef llvm::DenseMap<const DWARFDebugInfoEntry *, lldb::clang_type_t> DIEToClangType; - typedef llvm::DenseMap<lldb::clang_type_t, DIERef> ClangTypeToDIE; + typedef llvm::DenseMap<const DWARFDebugInfoEntry *, lldb::opaque_compiler_type_t> DIEToClangType; + typedef llvm::DenseMap<lldb::opaque_compiler_type_t, DIERef> ClangTypeToDIE; enum { Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Symbol/ClangASTContext.cpp (original) +++ lldb/trunk/source/Symbol/ClangASTContext.cpp Tue Sep 22 12:04:24 2015 @@ -841,7 +841,7 @@ ClangASTContext::GetBasicType (ASTContex { if (ast) { - clang_type_t clang_type = nullptr; + opaque_compiler_type_t clang_type = nullptr; switch (basic_type) { @@ -2124,7 +2124,7 @@ ClangASTContext::CreateEnumerationType // so we can support remote targets. The code below also requires a patch to // llvm::APInt. //bool -//ClangASTContext::ConvertFloatValueToString (ASTContext *ast, clang_type_t clang_type, const uint8_t* bytes, size_t byte_size, int apint_byte_order, std::string &float_str) +//ClangASTContext::ConvertFloatValueToString (ASTContext *ast, opaque_compiler_type_t clang_type, const uint8_t* bytes, size_t byte_size, int apint_byte_order, std::string &float_str) //{ // uint32_t count = 0; // bool is_complex = false; @@ -5024,7 +5024,7 @@ ClangASTContext::GetNumFields (void* typ return count; } -static clang_type_t +static opaque_compiler_type_t GetObjCFieldAtIndex (clang::ASTContext *ast, clang::ObjCInterfaceDecl *class_interface_decl, size_t idx, Modified: lldb/trunk/source/Symbol/ClangASTImporter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTImporter.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Symbol/ClangASTImporter.cpp (original) +++ lldb/trunk/source/Symbol/ClangASTImporter.cpp Tue Sep 22 12:04:24 2015 @@ -59,10 +59,10 @@ ClangASTImporter::CopyType (clang::ASTCo return QualType(); } -lldb::clang_type_t +lldb::opaque_compiler_type_t ClangASTImporter::CopyType (clang::ASTContext *dst_ast, clang::ASTContext *src_ast, - lldb::clang_type_t type) + lldb::opaque_compiler_type_t type) { return CopyType (dst_ast, src_ast, QualType::getFromOpaquePtr(type)).getAsOpaquePtr(); } @@ -237,10 +237,10 @@ public: } }; -lldb::clang_type_t +lldb::opaque_compiler_type_t ClangASTImporter::DeportType (clang::ASTContext *dst_ctx, clang::ASTContext *src_ctx, - lldb::clang_type_t type) + lldb::opaque_compiler_type_t type) { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); @@ -268,7 +268,7 @@ ClangASTImporter::DeportType (clang::AST minion_sp->InitDeportWorkQueues(&decls_to_deport, &decls_already_deported); - lldb::clang_type_t result = CopyType(dst_ctx, src_ctx, type); + lldb::opaque_compiler_type_t result = CopyType(dst_ctx, src_ctx, type); minion_sp->ExecuteDeportWorkQueues(); Modified: lldb/trunk/source/Symbol/CompilerType.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CompilerType.cpp?rev=248288&r1=248287&r2=248288&view=diff ============================================================================== --- lldb/trunk/source/Symbol/CompilerType.cpp (original) +++ lldb/trunk/source/Symbol/CompilerType.cpp Tue Sep 22 12:04:24 2015 @@ -1255,7 +1255,7 @@ CompilerType::WriteToMemory (lldb_privat } //clang::CXXRecordDecl * -//CompilerType::GetAsCXXRecordDecl (lldb::clang_type_t opaque_clang_qual_type) +//CompilerType::GetAsCXXRecordDecl (lldb::opaque_compiler_type_t opaque_clang_qual_type) //{ // if (opaque_clang_qual_type) // return clang::QualType::getFromOpaquePtr(opaque_clang_qual_type)->getAsCXXRecordDecl(); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
