[Lldb-commits] [lldb] r244689 - ClangASTType is now CompilerType.
Greg Clayton via lldb-commits
lldb-commits at lists.llvm.org
Tue Aug 11 15:53:02 PDT 2015
Author: gclayton
Date: Tue Aug 11 17:53:00 2015
New Revision: 244689
URL: http://llvm.org/viewvc/llvm-project?rev=244689&view=rev
Log:
ClangASTType is now CompilerType.
This is more preparation for multiple different kinds of types from different compilers (clang, Pascal, Go, RenderScript, Swift, etc).
Added:
lldb/trunk/include/lldb/Symbol/CompilerType.h
- copied, changed from r244679, lldb/trunk/include/lldb/Symbol/ClangASTType.h
lldb/trunk/source/Symbol/CompilerType.cpp
- copied, changed from r244679, lldb/trunk/source/Symbol/ClangASTType.cpp
Removed:
lldb/trunk/include/lldb/Symbol/ClangASTType.h
lldb/trunk/source/Symbol/ClangASTType.cpp
Modified:
lldb/trunk/include/lldb/API/SBType.h
lldb/trunk/include/lldb/Breakpoint/Watchpoint.h
lldb/trunk/include/lldb/Core/Value.h
lldb/trunk/include/lldb/Core/ValueObject.h
lldb/trunk/include/lldb/Core/ValueObjectCast.h
lldb/trunk/include/lldb/Core/ValueObjectChild.h
lldb/trunk/include/lldb/Core/ValueObjectConstResult.h
lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h
lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h
lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h
lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h
lldb/trunk/include/lldb/Core/ValueObjectMemory.h
lldb/trunk/include/lldb/Core/ValueObjectRegister.h
lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
lldb/trunk/include/lldb/Core/ValueObjectVariable.h
lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h
lldb/trunk/include/lldb/DataFormatters/FormatClasses.h
lldb/trunk/include/lldb/DataFormatters/FormatManager.h
lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h
lldb/trunk/include/lldb/DataFormatters/TypeFormat.h
lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h
lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h
lldb/trunk/include/lldb/Expression/ASTDumper.h
lldb/trunk/include/lldb/Expression/ClangASTSource.h
lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h
lldb/trunk/include/lldb/Expression/ClangFunction.h
lldb/trunk/include/lldb/Expression/Materializer.h
lldb/trunk/include/lldb/Symbol/Block.h
lldb/trunk/include/lldb/Symbol/ClangASTContext.h
lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
lldb/trunk/include/lldb/Symbol/Function.h
lldb/trunk/include/lldb/Symbol/SymbolFile.h
lldb/trunk/include/lldb/Symbol/TaggedASTType.h
lldb/trunk/include/lldb/Symbol/Type.h
lldb/trunk/include/lldb/Symbol/TypeSystem.h
lldb/trunk/include/lldb/Target/ABI.h
lldb/trunk/include/lldb/Target/LanguageRuntime.h
lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h
lldb/trunk/include/lldb/Target/Target.h
lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h
lldb/trunk/include/lldb/Utility/ProcessStructReader.h
lldb/trunk/include/lldb/lldb-forward.h
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/source/API/SBTarget.cpp
lldb/trunk/source/API/SBType.cpp
lldb/trunk/source/API/SBTypeEnumMember.cpp
lldb/trunk/source/API/SBTypeNameSpecifier.cpp
lldb/trunk/source/API/SBValue.cpp
lldb/trunk/source/Breakpoint/Watchpoint.cpp
lldb/trunk/source/Commands/CommandObjectArgs.cpp
lldb/trunk/source/Commands/CommandObjectFrame.cpp
lldb/trunk/source/Commands/CommandObjectMemory.cpp
lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp
lldb/trunk/source/Core/Value.cpp
lldb/trunk/source/Core/ValueObject.cpp
lldb/trunk/source/Core/ValueObjectCast.cpp
lldb/trunk/source/Core/ValueObjectChild.cpp
lldb/trunk/source/Core/ValueObjectConstResult.cpp
lldb/trunk/source/Core/ValueObjectConstResultCast.cpp
lldb/trunk/source/Core/ValueObjectConstResultChild.cpp
lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
lldb/trunk/source/Core/ValueObjectDynamicValue.cpp
lldb/trunk/source/Core/ValueObjectMemory.cpp
lldb/trunk/source/Core/ValueObjectRegister.cpp
lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp
lldb/trunk/source/Core/ValueObjectVariable.cpp
lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp
lldb/trunk/source/DataFormatters/Cocoa.cpp
lldb/trunk/source/DataFormatters/FormatManager.cpp
lldb/trunk/source/DataFormatters/LibCxxInitializerList.cpp
lldb/trunk/source/DataFormatters/LibCxxList.cpp
lldb/trunk/source/DataFormatters/LibCxxMap.cpp
lldb/trunk/source/DataFormatters/LibCxxVector.cpp
lldb/trunk/source/DataFormatters/LibStdcpp.cpp
lldb/trunk/source/DataFormatters/NSArray.cpp
lldb/trunk/source/DataFormatters/NSDictionary.cpp
lldb/trunk/source/DataFormatters/NSIndexPath.cpp
lldb/trunk/source/DataFormatters/TypeFormat.cpp
lldb/trunk/source/DataFormatters/TypeSummary.cpp
lldb/trunk/source/DataFormatters/TypeSynthetic.cpp
lldb/trunk/source/DataFormatters/VectorType.cpp
lldb/trunk/source/Expression/ASTDumper.cpp
lldb/trunk/source/Expression/ClangASTSource.cpp
lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
lldb/trunk/source/Expression/ClangExpressionVariable.cpp
lldb/trunk/source/Expression/ClangFunction.cpp
lldb/trunk/source/Expression/ClangUserExpression.cpp
lldb/trunk/source/Expression/IRForTarget.cpp
lldb/trunk/source/Expression/Materializer.cpp
lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp
lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h
lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp
lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h
lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp
lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h
lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp
lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.h
lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp
lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.h
lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp
lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h
lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp
lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h
lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp
lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h
lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h
lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h
lldb/trunk/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
lldb/trunk/source/Symbol/CMakeLists.txt
lldb/trunk/source/Symbol/ClangASTContext.cpp
lldb/trunk/source/Symbol/Function.cpp
lldb/trunk/source/Symbol/Type.cpp
lldb/trunk/source/Symbol/Variable.cpp
lldb/trunk/source/Target/ABI.cpp
lldb/trunk/source/Target/ObjCLanguageRuntime.cpp
lldb/trunk/source/Target/Target.cpp
lldb/trunk/source/Target/Thread.cpp
lldb/trunk/source/Target/ThreadPlanCallFunction.cpp
lldb/trunk/source/Target/ThreadPlanCallUserExpression.cpp
lldb/trunk/source/Target/ThreadPlanStepOut.cpp
Modified: lldb/trunk/include/lldb/API/SBType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBType.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBType.h (original)
+++ lldb/trunk/include/lldb/API/SBType.h Tue Aug 11 17:53:00 2015
@@ -290,7 +290,7 @@ protected:
friend class SBTypeList;
friend class SBValue;
- SBType (const lldb_private::ClangASTType &);
+ SBType (const lldb_private::CompilerType &);
SBType (const lldb::TypeSP &);
SBType (const lldb::TypeImplSP &);
Modified: lldb/trunk/include/lldb/Breakpoint/Watchpoint.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/Watchpoint.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/Watchpoint.h Tue Aug 11 17:53:00 2015
@@ -23,7 +23,7 @@
#include "lldb/Breakpoint/WatchpointOptions.h"
#include "lldb/Breakpoint/StoppointLocation.h"
#include "lldb/Core/UserID.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/Target.h"
namespace lldb_private {
@@ -77,7 +77,7 @@ public:
DISALLOW_COPY_AND_ASSIGN (WatchpointEventData);
};
- Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const ClangASTType *type, bool hardware = true);
+ Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const CompilerType *type, bool hardware = true);
~Watchpoint ();
void
@@ -195,8 +195,8 @@ public:
bool
IsDisabledDuringEphemeralMode();
- const ClangASTType &
- GetClangASTType()
+ const CompilerType &
+ GetCompilerType()
{
return m_type;
}
@@ -240,7 +240,7 @@ private:
std::string m_watch_spec_str; // Spec for the watchpoint.
lldb::ValueObjectSP m_old_value_sp;
lldb::ValueObjectSP m_new_value_sp;
- ClangASTType m_type;
+ CompilerType m_type;
Error m_error; // An error object describing errors associated with this watchpoint.
WatchpointOptions m_options; // Settable watchpoint options, which is a delegate to handle
// the callback machinery.
Modified: lldb/trunk/include/lldb/Core/Value.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Value.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Value.h (original)
+++ lldb/trunk/include/lldb/Core/Value.h Tue Aug 11 17:53:00 2015
@@ -21,7 +21,7 @@
#include "lldb/Core/DataBufferHeap.h"
#include "lldb/Core/Error.h"
#include "lldb/Core/Scalar.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
namespace lldb_private {
@@ -136,11 +136,11 @@ public:
Value &
operator=(const Value &rhs);
- const ClangASTType &
+ const CompilerType &
GetClangType();
void
- SetClangType (const ClangASTType &clang_type);
+ SetClangType (const CompilerType &clang_type);
ValueType
GetValueType() const;
@@ -292,7 +292,7 @@ public:
protected:
Scalar m_value;
Vector m_vector;
- ClangASTType m_clang_type;
+ CompilerType m_clang_type;
void * m_context;
ValueType m_value_type;
ContextType m_context_type;
Modified: lldb/trunk/include/lldb/Core/ValueObject.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObject.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObject.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObject.h Tue Aug 11 17:53:00 2015
@@ -27,7 +27,7 @@
#include "lldb/Core/ConstString.h"
#include "lldb/Core/UserID.h"
#include "lldb/Core/Value.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/ExecutionContextScope.h"
#include "lldb/Target/Process.h"
@@ -373,7 +373,7 @@ public:
virtual ~ValueObject();
- ClangASTType
+ CompilerType
GetClangType ();
// this vends a TypeImpl that is useful at the SB API layer
@@ -408,7 +408,7 @@ public:
GetObjectRuntimeLanguage();
virtual uint32_t
- GetTypeInfo (ClangASTType *pointee_or_element_clang_type = NULL);
+ GetTypeInfo (CompilerType *pointee_or_element_clang_type = NULL);
virtual bool
IsPointerType ();
@@ -690,10 +690,10 @@ public:
GetSyntheticExpressionPathChild(const char* expression, bool can_create);
virtual lldb::ValueObjectSP
- GetSyntheticChildAtOffset(uint32_t offset, const ClangASTType& type, bool can_create);
+ GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create);
virtual lldb::ValueObjectSP
- GetSyntheticBase (uint32_t offset, const ClangASTType& type, bool can_create);
+ GetSyntheticBase (uint32_t offset, const CompilerType& type, bool can_create);
virtual lldb::ValueObjectSP
GetDynamicValue (lldb::DynamicValueType valueType);
@@ -746,11 +746,11 @@ public:
GetCPPVTableAddress(AddressType &address_type);
virtual lldb::ValueObjectSP
- Cast (const ClangASTType &clang_ast_type);
+ Cast (const CompilerType &clang_ast_type);
virtual lldb::ValueObjectSP
CastPointerType (const char *name,
- ClangASTType &ast_type);
+ CompilerType &ast_type);
virtual lldb::ValueObjectSP
CastPointerType (const char *name,
@@ -809,13 +809,13 @@ public:
CreateValueObjectFromAddress (const char* name,
uint64_t address,
const ExecutionContext& exe_ctx,
- ClangASTType type);
+ CompilerType type);
static lldb::ValueObjectSP
CreateValueObjectFromData (const char* name,
const DataExtractor& data,
const ExecutionContext& exe_ctx,
- ClangASTType type);
+ CompilerType type);
void
LogValueObject (Log *log);
@@ -1093,7 +1093,7 @@ protected:
llvm::Optional<std::pair<TypeValidatorResult, std::string>> m_validation_result;
- ClangASTType m_override_type;// If the type of the value object should be overridden, the type to impose.
+ CompilerType m_override_type;// If the type of the value object should be overridden, the type to impose.
ValueObjectManager *m_manager; // This object is managed by the root object (any ValueObject that gets created
// without a parent.) The manager gets passed through all the generations of
@@ -1231,7 +1231,7 @@ protected:
// Subclasses must implement the functions below.
//------------------------------------------------------------------
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl () = 0;
const char *
@@ -1246,7 +1246,7 @@ private:
// For ValueObject only
//------------------------------------------------------------------
- virtual ClangASTType
+ virtual CompilerType
MaybeCalculateCompleteType ();
lldb::ValueObjectSP
Modified: lldb/trunk/include/lldb/Core/ValueObjectCast.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectCast.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectCast.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectCast.h Tue Aug 11 17:53:00 2015
@@ -27,7 +27,7 @@ public:
static lldb::ValueObjectSP
Create (ValueObject &parent,
const ConstString &name,
- const ClangASTType &cast_type);
+ const CompilerType &cast_type);
virtual
~ValueObjectCast();
@@ -66,14 +66,14 @@ protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
- ClangASTType m_cast_type;
+ CompilerType m_cast_type;
ValueObjectCast (ValueObject &parent,
const ConstString &name,
- const ClangASTType &cast_type);
+ const CompilerType &cast_type);
private:
//------------------------------------------------------------------
Modified: lldb/trunk/include/lldb/Core/ValueObjectChild.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectChild.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectChild.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectChild.h Tue Aug 11 17:53:00 2015
@@ -89,13 +89,13 @@ protected:
virtual LazyBool
CanUpdateWithInvalidExecutionContext ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ()
{
return m_clang_type;
}
- ClangASTType m_clang_type;
+ CompilerType m_clang_type;
ConstString m_type_name;
uint64_t m_byte_size;
int32_t m_byte_offset;
@@ -114,7 +114,7 @@ protected:
friend class ValueObjectConstResult;
friend class ValueObjectConstResultImpl;
ValueObjectChild (ValueObject &parent,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
uint64_t byte_size,
int32_t byte_offset,
Modified: lldb/trunk/include/lldb/Core/ValueObjectConstResult.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectConstResult.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResult.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResult.h Tue Aug 11 17:53:00 2015
@@ -34,14 +34,14 @@ public:
static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const DataExtractor &data,
lldb::addr_t address = LLDB_INVALID_ADDRESS);
static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const lldb::DataBufferSP &result_data_sp,
lldb::ByteOrder byte_order,
@@ -50,7 +50,7 @@ public:
static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
lldb::addr_t address,
AddressType address_type,
@@ -97,7 +97,7 @@ public:
CreateChildAtIndex (size_t idx, bool synthetic_array_member, int32_t synthetic_index);
virtual lldb::ValueObjectSP
- GetSyntheticChildAtOffset(uint32_t offset, const ClangASTType& type, bool can_create);
+ GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create);
virtual lldb::ValueObjectSP
AddressOf (Error &error);
@@ -132,13 +132,13 @@ public:
GetPreferredDisplayLanguage ();
virtual lldb::ValueObjectSP
- Cast (const ClangASTType &clang_ast_type);
+ Cast (const CompilerType &clang_ast_type);
protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
ConstString m_type_name;
@@ -154,13 +154,13 @@ private:
lldb::addr_t address);
ValueObjectConstResult (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const DataExtractor &data,
lldb::addr_t address);
ValueObjectConstResult (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const lldb::DataBufferSP &result_data_sp,
lldb::ByteOrder byte_order,
@@ -168,7 +168,7 @@ private:
lldb::addr_t address);
ValueObjectConstResult (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
lldb::addr_t address,
AddressType address_type,
Modified: lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h Tue Aug 11 17:53:00 2015
@@ -25,7 +25,7 @@ public:
ValueObjectConstResultCast (
ValueObject &parent,
const ConstString &name,
- const ClangASTType &cast_type,
+ const CompilerType &cast_type,
lldb::addr_t live_address = LLDB_INVALID_ADDRESS);
virtual
@@ -39,7 +39,7 @@ public:
bool synthetic_array_member,
int32_t synthetic_index);
- virtual ClangASTType
+ virtual CompilerType
GetClangType ()
{
return ValueObjectCast::GetClangType();
@@ -47,7 +47,7 @@ public:
virtual lldb::ValueObjectSP
GetSyntheticChildAtOffset(uint32_t offset,
- const ClangASTType& type,
+ const CompilerType& type,
bool can_create);
virtual lldb::ValueObjectSP
@@ -59,7 +59,7 @@ public:
uint32_t item_count = 1);
virtual lldb::ValueObjectSP
- Cast (const ClangASTType &clang_ast_type);
+ Cast (const CompilerType &clang_ast_type);
protected:
ValueObjectConstResultImpl m_impl;
Modified: lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h Tue Aug 11 17:53:00 2015
@@ -27,7 +27,7 @@ class ValueObjectConstResultChild : publ
public:
ValueObjectConstResultChild (ValueObject &parent,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
uint32_t byte_size,
int32_t byte_offset,
@@ -45,14 +45,14 @@ public:
virtual ValueObject *
CreateChildAtIndex (size_t idx, bool synthetic_array_member, int32_t synthetic_index);
- virtual ClangASTType
+ virtual CompilerType
GetClangType ()
{
return ValueObjectChild::GetClangType();
}
virtual lldb::ValueObjectSP
- GetSyntheticChildAtOffset(uint32_t offset, const ClangASTType& type, bool can_create);
+ GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create);
virtual lldb::ValueObjectSP
AddressOf (Error &error);
@@ -63,7 +63,7 @@ public:
uint32_t item_count = 1);
virtual lldb::ValueObjectSP
- Cast (const ClangASTType &clang_ast_type);
+ Cast (const CompilerType &clang_ast_type);
protected:
ValueObjectConstResultImpl m_impl;
Modified: lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@ public:
CreateChildAtIndex (size_t idx, bool synthetic_array_member, int32_t synthetic_index);
lldb::ValueObjectSP
- GetSyntheticChildAtOffset (uint32_t offset, const ClangASTType& type, bool can_create);
+ GetSyntheticChildAtOffset (uint32_t offset, const CompilerType& type, bool can_create);
lldb::ValueObjectSP
AddressOf (Error &error);
@@ -54,7 +54,7 @@ public:
}
lldb::ValueObjectSP
- Cast (const ClangASTType &clang_ast_type);
+ Cast (const CompilerType &clang_ast_type);
void
SetLiveAddress(lldb::addr_t addr = LLDB_INVALID_ADDRESS,
Modified: lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h Tue Aug 11 17:53:00 2015
@@ -127,7 +127,7 @@ protected:
return true;
}
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
Address m_address; ///< The variable that this value object is based upon
Modified: lldb/trunk/include/lldb/Core/ValueObjectMemory.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectMemory.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectMemory.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectMemory.h Tue Aug 11 17:53:00 2015
@@ -15,7 +15,7 @@
// Other libraries and framework includes
// Project includes
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
namespace lldb_private {
@@ -36,7 +36,7 @@ public:
Create (ExecutionContextScope *exe_scope,
const char *name,
const Address &address,
- const ClangASTType &ast_type);
+ const CompilerType &ast_type);
virtual
~ValueObjectMemory();
@@ -66,12 +66,12 @@ protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
Address m_address; ///< The variable that this value object is based upon
lldb::TypeSP m_type_sp;
- ClangASTType m_clang_type;
+ CompilerType m_clang_type;
private:
ValueObjectMemory (ExecutionContextScope *exe_scope,
@@ -82,7 +82,7 @@ private:
ValueObjectMemory (ExecutionContextScope *exe_scope,
const char *name,
const Address &address,
- const ClangASTType &ast_type);
+ const CompilerType &ast_type);
//------------------------------------------------------------------
// For ValueObject only
//------------------------------------------------------------------
Modified: lldb/trunk/include/lldb/Core/ValueObjectRegister.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectRegister.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectRegister.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectRegister.h Tue Aug 11 17:53:00 2015
@@ -59,7 +59,7 @@ protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
lldb::RegisterContextSP m_reg_ctx_sp;
@@ -113,7 +113,7 @@ protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
lldb::RegisterContextSP m_reg_ctx_sp;
@@ -170,14 +170,14 @@ protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
lldb::RegisterContextSP m_reg_ctx_sp;
RegisterInfo m_reg_info;
RegisterValue m_reg_value;
ConstString m_type_name;
- ClangASTType m_clang_type;
+ CompilerType m_clang_type;
private:
void
Modified: lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h Tue Aug 11 17:53:00 2015
@@ -162,7 +162,7 @@ protected:
return eLazyBoolYes;
}
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
virtual void
Modified: lldb/trunk/include/lldb/Core/ValueObjectVariable.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObjectVariable.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectVariable.h (original)
+++ lldb/trunk/include/lldb/Core/ValueObjectVariable.h Tue Aug 11 17:53:00 2015
@@ -74,7 +74,7 @@ protected:
virtual bool
UpdateValue ();
- virtual ClangASTType
+ virtual CompilerType
GetClangTypeImpl ();
lldb::VariableSP m_variable_sp; ///< The variable that this value object is based upon
Modified: lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h Tue Aug 11 17:53:00 2015
@@ -221,7 +221,7 @@ namespace lldb_private {
virtual
~LibcxxVectorBoolSyntheticFrontEnd ();
private:
- ClangASTType m_bool_type;
+ CompilerType m_bool_type;
ExecutionContextRef m_exe_ctx_ref;
uint64_t m_count;
lldb::addr_t m_base_data_address;
@@ -258,7 +258,7 @@ namespace lldb_private {
private:
ExecutionContextRef m_exe_ctx_ref;
lldb::addr_t m_pair_address;
- ClangASTType m_pair_type;
+ CompilerType m_pair_type;
EvaluateExpressionOptions m_options;
lldb::ValueObjectSP m_pair_sp;
};
Modified: lldb/trunk/include/lldb/DataFormatters/FormatClasses.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/FormatClasses.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/FormatClasses.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/FormatClasses.h Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/lldb-public.h"
#include "lldb/lldb-enumerations.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/Type.h"
namespace lldb_private {
@@ -130,7 +130,7 @@ public:
}
}
- TypeNameSpecifierImpl (ClangASTType type) :
+ TypeNameSpecifierImpl (CompilerType type) :
m_is_regex(false),
m_type()
{
@@ -157,12 +157,12 @@ public:
return lldb::TypeSP();
}
- ClangASTType
- GetClangASTType ()
+ CompilerType
+ GetCompilerType ()
{
if (m_type.m_type_pair.IsValid())
- return m_type.m_type_pair.GetClangASTType();
- return ClangASTType();
+ return m_type.m_type_pair.GetCompilerType();
+ return CompilerType();
}
bool
@@ -174,7 +174,7 @@ public:
private:
bool m_is_regex;
// this works better than TypeAndOrName because the latter only wraps a TypeSP
- // whereas TypePair can also be backed by a ClangASTType
+ // whereas TypePair can also be backed by a CompilerType
struct TypeOrName
{
std::string m_type_name;
Modified: lldb/trunk/include/lldb/DataFormatters/FormatManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/FormatManager.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/FormatManager.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/FormatManager.h Tue Aug 11 17:53:00 2015
@@ -263,7 +263,7 @@ private:
static void
GetPossibleMatches (ValueObject& valobj,
- ClangASTType clang_type,
+ CompilerType clang_type,
uint32_t reason,
lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries,
Modified: lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/FormattersContainer.h Tue Aug 11 17:53:00 2015
@@ -32,7 +32,7 @@
#include "lldb/DataFormatters/TypeValidator.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/ObjCLanguageRuntime.h"
#include "lldb/Target/Process.h"
@@ -268,7 +268,7 @@ public:
uint32_t* why = NULL)
{
uint32_t value = lldb_private::eFormatterChoiceCriterionDirectChoice;
- ClangASTType ast_type(valobj.GetClangType());
+ CompilerType ast_type(valobj.GetClangType());
bool ret = Get(valobj, ast_type, entry, use_dynamic, value);
if (ret)
entry = MapValueType(entry);
Modified: lldb/trunk/include/lldb/DataFormatters/TypeFormat.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/TypeFormat.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/TypeFormat.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/TypeFormat.h Tue Aug 11 17:53:00 2015
@@ -329,7 +329,7 @@ namespace lldb_private {
protected:
ConstString m_enum_type;
- mutable std::unordered_map<void*,ClangASTType> m_types;
+ mutable std::unordered_map<void*,CompilerType> m_types;
private:
DISALLOW_COPY_AND_ASSIGN(TypeFormatImpl_EnumType);
Modified: lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h Tue Aug 11 17:53:00 2015
@@ -98,13 +98,13 @@ namespace lldb_private {
CreateValueObjectFromAddress (const char* name,
uint64_t address,
const ExecutionContext& exe_ctx,
- ClangASTType type);
+ CompilerType type);
lldb::ValueObjectSP
CreateValueObjectFromData (const char* name,
const DataExtractor& data,
const ExecutionContext& exe_ctx,
- ClangASTType type);
+ CompilerType type);
private:
bool m_valid;
Modified: lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h Tue Aug 11 17:53:00 2015
@@ -413,7 +413,7 @@ private:
Stream *m_stream;
DumpValueObjectOptions options;
Flags m_type_flags;
- ClangASTType m_clang_type;
+ CompilerType m_clang_type;
DumpValueObjectOptions::PointerDepth m_ptr_depth;
uint32_t m_curr_depth;
LazyBool m_should_print;
Modified: lldb/trunk/include/lldb/Expression/ASTDumper.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ASTDumper.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ASTDumper.h (original)
+++ lldb/trunk/include/lldb/Expression/ASTDumper.h Tue Aug 11 17:53:00 2015
@@ -28,7 +28,7 @@ public:
ASTDumper (const clang::Type *type);
ASTDumper (clang::QualType type);
ASTDumper (lldb::clang_type_t type);
- ASTDumper (const ClangASTType &clang_type);
+ ASTDumper (const CompilerType &clang_type);
const char *GetCString();
void ToSTDERR();
Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Tue Aug 11 17:53:00 2015
@@ -15,7 +15,7 @@
#include "clang/Basic/IdentifierTable.h"
#include "lldb/Symbol/ClangExternalASTSourceCommon.h"
#include "lldb/Symbol/ClangASTImporter.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/Target.h"
#include "llvm/ADT/SmallSet.h"
@@ -395,8 +395,8 @@ protected:
/// @return
/// The imported type.
//------------------------------------------------------------------
- ClangASTType
- GuardedCopyType (const ClangASTType &src_type);
+ CompilerType
+ GuardedCopyType (const CompilerType &src_type);
friend struct NameSearchContext;
@@ -424,7 +424,7 @@ struct NameSearchContext {
ClangASTImporter::NamespaceMapSP m_namespace_map; ///< The mapping of all namespaces found for this request back to their modules
const clang::DeclarationName &m_decl_name; ///< The name being looked for
const clang::DeclContext *m_decl_context; ///< The DeclContext to put declarations into
- llvm::SmallSet <ClangASTType, 5> m_function_types; ///< All the types of functions that have been reported, so we don't report conflicts
+ llvm::SmallSet <CompilerType, 5> m_function_types; ///< All the types of functions that have been reported, so we don't report conflicts
struct {
bool variable : 1;
@@ -469,7 +469,7 @@ struct NameSearchContext {
/// @param[in] type
/// The opaque QualType for the VarDecl being registered.
//------------------------------------------------------------------
- clang::NamedDecl *AddVarDecl(const ClangASTType &type);
+ clang::NamedDecl *AddVarDecl(const CompilerType &type);
//------------------------------------------------------------------
/// Create a FunDecl with the name being searched for and the provided
@@ -481,7 +481,7 @@ struct NameSearchContext {
/// @param[in] extern_c
/// If true, build an extern "C" linkage specification for this.
//------------------------------------------------------------------
- clang::NamedDecl *AddFunDecl(const ClangASTType &type,
+ clang::NamedDecl *AddFunDecl(const CompilerType &type,
bool extern_c = false);
//------------------------------------------------------------------
@@ -498,7 +498,7 @@ struct NameSearchContext {
/// @param[in] type
/// The opaque QualType for the TypeDecl being registered.
//------------------------------------------------------------------
- clang::NamedDecl *AddTypeDecl(const ClangASTType &clang_type);
+ clang::NamedDecl *AddTypeDecl(const CompilerType &clang_type);
//------------------------------------------------------------------
Modified: lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h Tue Aug 11 17:53:00 2015
@@ -221,11 +221,11 @@ public:
void
SetRegisterInfo (const RegisterInfo *reg_info);
- ClangASTType
+ CompilerType
GetClangType ();
void
- SetClangType (const ClangASTType &clang_type);
+ SetClangType (const CompilerType &clang_type);
TypeFromUser
GetTypeFromUser ();
Modified: lldb/trunk/include/lldb/Expression/ClangFunction.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangFunction.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangFunction.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangFunction.h Tue Aug 11 17:53:00 2015
@@ -22,7 +22,7 @@
#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObjectList.h"
#include "lldb/Expression/ClangExpression.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/Process.h"
namespace lldb_private
@@ -114,7 +114,7 @@ public:
/// be overridden using WriteFunctionArguments().
//------------------------------------------------------------------
ClangFunction (ExecutionContextScope &exe_scope,
- const ClangASTType &return_type,
+ const CompilerType &return_type,
const Address& function_address,
const ValueList &arg_value_list,
const char *name);
@@ -421,7 +421,7 @@ private:
Function *m_function_ptr; ///< The function we're going to call. May be NULL if we don't have debug info for the function.
Address m_function_addr; ///< If we don't have the FunctionSP, we at least need the address & return type.
- ClangASTType m_function_return_type; ///< The opaque clang qual type for the function return type.
+ CompilerType m_function_return_type; ///< The opaque clang qual type for the function return type.
std::string m_wrapper_function_name; ///< The name of the wrapper function.
std::string m_wrapper_function_text; ///< The contents of the wrapper function.
Modified: lldb/trunk/include/lldb/Expression/Materializer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/Materializer.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/Materializer.h (original)
+++ lldb/trunk/include/lldb/Expression/Materializer.h Tue Aug 11 17:53:00 2015
@@ -148,7 +148,7 @@ public:
m_offset = offset;
}
protected:
- void SetSizeAndAlignmentFromType (ClangASTType &type);
+ void SetSizeAndAlignmentFromType (CompilerType &type);
uint32_t m_alignment;
uint32_t m_size;
Modified: lldb/trunk/include/lldb/Symbol/Block.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Block.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Block.h (original)
+++ lldb/trunk/include/lldb/Symbol/Block.h Tue Aug 11 17:53:00 2015
@@ -17,7 +17,7 @@
#include "lldb/Core/UserID.h"
#include "lldb/Symbol/LineEntry.h"
#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
namespace lldb_private {
Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Tue Aug 11 17:53:00 2015
@@ -29,7 +29,7 @@
#include "lldb/lldb-enumerations.h"
#include "lldb/Core/ClangForward.h"
#include "lldb/Core/ConstString.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/TypeSystem.h"
namespace lldb_private {
@@ -144,40 +144,40 @@ public:
//------------------------------------------------------------------
// Basic Types
//------------------------------------------------------------------
- ClangASTType
+ CompilerType
GetBuiltinTypeForEncodingAndBitSize (lldb::Encoding encoding,
uint32_t bit_size);
- static ClangASTType
+ static CompilerType
GetBuiltinTypeForEncodingAndBitSize (clang::ASTContext *ast,
lldb::Encoding encoding,
uint32_t bit_size);
- ClangASTType
+ CompilerType
GetBasicType (lldb::BasicType type);
- static ClangASTType
+ static CompilerType
GetBasicType (clang::ASTContext *ast, lldb::BasicType type);
- static ClangASTType
+ static CompilerType
GetBasicType (clang::ASTContext *ast, const ConstString &name);
static lldb::BasicType
GetBasicTypeEnumeration (const ConstString &name);
- ClangASTType
+ CompilerType
GetBuiltinTypeForDWARFEncodingAndBitSize (
const char *type_name,
uint32_t dw_ate,
uint32_t bit_size);
- ClangASTType
+ CompilerType
GetCStringType(bool is_const);
- static ClangASTType
+ static CompilerType
GetUnknownAnyType(clang::ASTContext *ast);
- ClangASTType
+ CompilerType
GetUnknownAnyType()
{
return ClangASTContext::GetUnknownAnyType(getASTContext());
@@ -188,7 +188,7 @@ public:
GetDeclContextForType (clang::QualType type);
static clang::DeclContext *
- GetDeclContextForType (const ClangASTType& type)
+ GetDeclContextForType (const CompilerType& type)
{
return GetDeclContextForType(GetQualType(type));
}
@@ -211,9 +211,9 @@ public:
bool &is_instance_method,
ConstString &language_object_name);
- static ClangASTType
+ static CompilerType
CopyType(clang::ASTContext *dest_context,
- ClangASTType source_type);
+ CompilerType source_type);
static clang::Decl *
CopyDecl (clang::ASTContext *dest_context,
@@ -221,24 +221,24 @@ public:
clang::Decl *source_decl);
static bool
- AreTypesSame(ClangASTType type1,
- ClangASTType type2,
+ AreTypesSame(CompilerType type1,
+ CompilerType type2,
bool ignore_qualifiers = false);
- static ClangASTType
+ static CompilerType
GetTypeForDecl (clang::NamedDecl *decl);
- static ClangASTType
+ static CompilerType
GetTypeForDecl (clang::TagDecl *decl);
- static ClangASTType
+ static CompilerType
GetTypeForDecl (clang::ObjCInterfaceDecl *objc_decl);
template <typename RecordDeclType>
- ClangASTType
+ CompilerType
GetTypeForIdentifier (const ConstString &type_name)
{
- ClangASTType clang_type;
+ CompilerType clang_type;
if (type_name.GetLength())
{
@@ -262,9 +262,9 @@ public:
return clang_type;
}
- ClangASTType
+ CompilerType
GetOrCreateStructForIdentifier (const ConstString &type_name,
- const std::initializer_list< std::pair < const char *, ClangASTType > >& type_fields,
+ const std::initializer_list< std::pair < const char *, CompilerType > >& type_fields,
bool packed = false);
//------------------------------------------------------------------
@@ -281,7 +281,7 @@ public:
GetNumBaseClasses (const clang::CXXRecordDecl *cxx_record_decl,
bool omit_empty_base_classes);
- ClangASTType
+ CompilerType
CreateRecordType (clang::DeclContext *decl_ctx,
lldb::AccessType access_type,
const char *name,
@@ -336,7 +336,7 @@ public:
int kind,
const TemplateParameterInfos &infos);
- ClangASTType
+ CompilerType
CreateClassTemplateSpecializationType (clang::ClassTemplateSpecializationDecl *class_template_specialization_decl);
static clang::DeclContext *
@@ -363,7 +363,7 @@ public:
RecordHasFields (const clang::RecordDecl *record_decl);
- ClangASTType
+ CompilerType
CreateObjCClass (const char *name,
clang::DeclContext *decl_ctx,
bool isForwardDecl,
@@ -399,21 +399,21 @@ public:
clang::FunctionDecl *
CreateFunctionDeclaration (clang::DeclContext *decl_ctx,
const char *name,
- const ClangASTType &function_Type,
+ const CompilerType &function_Type,
int storage,
bool is_inline);
- static ClangASTType
+ static CompilerType
CreateFunctionType (clang::ASTContext *ast,
- const ClangASTType &result_type,
- const ClangASTType *args,
+ const CompilerType &result_type,
+ const CompilerType *args,
unsigned num_args,
bool is_variadic,
unsigned type_quals);
- ClangASTType
- CreateFunctionType (const ClangASTType &result_type,
- const ClangASTType *args,
+ CompilerType
+ CreateFunctionType (const CompilerType &result_type,
+ const CompilerType *args,
unsigned num_args,
bool is_variadic,
unsigned type_quals)
@@ -428,7 +428,7 @@ public:
clang::ParmVarDecl *
CreateParameterDeclaration (const char *name,
- const ClangASTType ¶m_type,
+ const CompilerType ¶m_type,
int storage);
void
@@ -440,54 +440,54 @@ public:
// Array Types
//------------------------------------------------------------------
- ClangASTType
- CreateArrayType (const ClangASTType &element_type,
+ CompilerType
+ CreateArrayType (const CompilerType &element_type,
size_t element_count,
bool is_vector);
//------------------------------------------------------------------
// Enumeration Types
//------------------------------------------------------------------
- ClangASTType
+ CompilerType
CreateEnumerationType (const char *name,
clang::DeclContext *decl_ctx,
const Declaration &decl,
- const ClangASTType &integer_qual_type);
+ const CompilerType &integer_qual_type);
//------------------------------------------------------------------
// Integer type functions
//------------------------------------------------------------------
- ClangASTType
+ CompilerType
GetIntTypeFromBitSize (size_t bit_size, bool is_signed)
{
return GetIntTypeFromBitSize (getASTContext(), bit_size, is_signed);
}
- static ClangASTType
+ static CompilerType
GetIntTypeFromBitSize (clang::ASTContext *ast,
size_t bit_size, bool is_signed);
- ClangASTType
+ CompilerType
GetPointerSizedIntType (bool is_signed)
{
return GetPointerSizedIntType (getASTContext(), is_signed);
}
- static ClangASTType
+ static CompilerType
GetPointerSizedIntType (clang::ASTContext *ast, bool is_signed);
//------------------------------------------------------------------
// Floating point functions
//------------------------------------------------------------------
- ClangASTType
+ CompilerType
GetFloatTypeFromBitSize (size_t bit_size)
{
return GetFloatTypeFromBitSize (getASTContext(), bit_size);
}
- static ClangASTType
+ static CompilerType
GetFloatTypeFromBitSize (clang::ASTContext *ast,
size_t bit_size);
@@ -507,13 +507,13 @@ public:
bool
IsArrayType (void* type,
- ClangASTType *element_type,
+ CompilerType *element_type,
uint64_t *size,
bool *is_incomplete) override;
bool
IsVectorType (void* type,
- ClangASTType *element_type,
+ CompilerType *element_type,
uint64_t *size) override;
bool
@@ -535,7 +535,7 @@ public:
IsCStringType (void* type, uint32_t &length) override;
static bool
- IsCXXClassType (const ClangASTType& type);
+ IsCXXClassType (const CompilerType& type);
bool
IsDefined(void* type) override;
@@ -547,12 +547,12 @@ public:
IsFunctionType (void* type, bool *is_variadic_ptr) override;
uint32_t
- IsHomogeneousAggregate (void* type, ClangASTType* base_type_ptr) override;
+ IsHomogeneousAggregate (void* type, CompilerType* base_type_ptr) override;
size_t
GetNumberOfFunctionArguments (void* type) override;
- ClangASTType
+ CompilerType
GetFunctionArgumentAtIndex (void* type, const size_t index) override;
bool
@@ -562,23 +562,23 @@ public:
IsIntegerType (void* type, bool &is_signed) override;
static bool
- IsObjCClassType (const ClangASTType& type);
+ IsObjCClassType (const CompilerType& type);
static bool
- IsObjCClassTypeAndHasIVars (const ClangASTType& type, bool check_superclass);
+ IsObjCClassTypeAndHasIVars (const CompilerType& type, bool check_superclass);
static bool
- IsObjCObjectOrInterfaceType (const ClangASTType& type);
+ IsObjCObjectOrInterfaceType (const CompilerType& type);
static bool
- IsObjCObjectPointerType (const ClangASTType& type, ClangASTType *target_type = NULL);
+ IsObjCObjectPointerType (const CompilerType& type, CompilerType *target_type = NULL);
bool
IsPolymorphicClass (void* type) override;
bool
IsPossibleDynamicType (void* type,
- ClangASTType *target_type, // Can pass NULL
+ CompilerType *target_type, // Can pass NULL
bool check_cplusplus,
bool check_objc) override;
@@ -586,13 +586,13 @@ public:
IsRuntimeGeneratedType (void* type) override;
bool
- IsPointerType (void* type, ClangASTType *pointee_type) override;
+ IsPointerType (void* type, CompilerType *pointee_type) override;
bool
- IsPointerOrReferenceType (void* type, ClangASTType *pointee_type) override;
+ IsPointerOrReferenceType (void* type, CompilerType *pointee_type) override;
bool
- IsReferenceType (void* type, ClangASTType *pointee_type, bool* is_rvalue) override;
+ IsReferenceType (void* type, CompilerType *pointee_type, bool* is_rvalue) override;
bool
IsScalarType (void* type) override;
@@ -604,10 +604,10 @@ public:
IsVoidType (void* type) override;
static bool
- GetCXXClassName (const ClangASTType& type, std::string &class_name);
+ GetCXXClassName (const CompilerType& type, std::string &class_name);
static bool
- GetObjCClassName (const ClangASTType& type, std::string &class_name);
+ GetObjCClassName (const CompilerType& type, std::string &class_name);
//----------------------------------------------------------------------
@@ -625,7 +625,7 @@ public:
GetTypeName (void* type) override;
uint32_t
- GetTypeInfo (void* type, ClangASTType *pointee_or_element_clang_type) override;
+ GetTypeInfo (void* type, CompilerType *pointee_or_element_clang_type) override;
lldb::LanguageType
GetMinimumLanguage (void* type) override;
@@ -640,29 +640,29 @@ public:
// Creating related types
//----------------------------------------------------------------------
- static ClangASTType
- AddConstModifier (const ClangASTType& type);
+ static CompilerType
+ AddConstModifier (const CompilerType& type);
- static ClangASTType
- AddRestrictModifier (const ClangASTType& type);
+ static CompilerType
+ AddRestrictModifier (const CompilerType& type);
- static ClangASTType
- AddVolatileModifier (const ClangASTType& 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 ClangASTType
- CreateTypedefType (const ClangASTType& type,
+ static CompilerType
+ CreateTypedefType (const CompilerType& type,
const char *typedef_name,
clang::DeclContext *decl_ctx);
- ClangASTType
+ CompilerType
GetArrayElementType (void* type, uint64_t *stride) override;
- ClangASTType
+ CompilerType
GetCanonicalType (void* type) override;
- ClangASTType
+ CompilerType
GetFullyUnqualifiedType (void* type) override;
// Returns -1 if this isn't a function of if the function doesn't have a prototype
@@ -670,10 +670,10 @@ public:
int
GetFunctionArgumentCount (void* type) override;
- ClangASTType
+ CompilerType
GetFunctionArgumentTypeAtIndex (void* type, size_t idx) override;
- ClangASTType
+ CompilerType
GetFunctionReturnType (void* type) override;
size_t
@@ -682,32 +682,32 @@ public:
TypeMemberFunctionImpl
GetMemberFunctionAtIndex (void* type, size_t idx) override;
- static ClangASTType
- GetLValueReferenceType (const ClangASTType& type);
+ static CompilerType
+ GetLValueReferenceType (const CompilerType& type);
- ClangASTType
+ CompilerType
GetNonReferenceType (void* type) override;
- ClangASTType
+ CompilerType
GetPointeeType (void* type) override;
- ClangASTType
+ CompilerType
GetPointerType (void* type) override;
- static ClangASTType
- GetRValueReferenceType (const ClangASTType& type);
+ static CompilerType
+ GetRValueReferenceType (const CompilerType& type);
// If the current object represents a typedef type, get the underlying type
- ClangASTType
+ CompilerType
GetTypedefedType (void* type) override;
- static ClangASTType
- RemoveFastQualifiers (const ClangASTType& type);
+ static CompilerType
+ RemoveFastQualifiers (const CompilerType& type);
//----------------------------------------------------------------------
// Create related types using the current type's AST
//----------------------------------------------------------------------
- ClangASTType
+ CompilerType
GetBasicTypeFromAST (void* type, lldb::BasicType basic_type) override;
//----------------------------------------------------------------------
@@ -742,25 +742,25 @@ public:
GetBasicTypeEnumeration (void* type, const ConstString &name);
static uint32_t
- GetNumDirectBaseClasses (const ClangASTType& type);
+ GetNumDirectBaseClasses (const CompilerType& type);
static uint32_t
- GetNumVirtualBaseClasses (const ClangASTType& type);
+ GetNumVirtualBaseClasses (const CompilerType& type);
uint32_t
GetNumFields (void* type) override;
- static ClangASTType
- GetDirectBaseClassAtIndex (const ClangASTType& type,
+ static CompilerType
+ GetDirectBaseClassAtIndex (const CompilerType& type,
size_t idx,
uint32_t *bit_offset_ptr);
- static ClangASTType
- GetVirtualBaseClassAtIndex (const ClangASTType& type,
+ static CompilerType
+ GetVirtualBaseClassAtIndex (const CompilerType& type,
size_t idx,
uint32_t *bit_offset_ptr);
- ClangASTType
+ CompilerType
GetFieldAtIndex (void* type,
size_t idx,
std::string& name,
@@ -771,7 +771,7 @@ public:
static uint32_t
GetNumPointeeChildren (clang::QualType type);
- ClangASTType
+ CompilerType
GetChildClangTypeAtIndex (void* type,
ExecutionContext *exe_ctx,
size_t idx,
@@ -806,10 +806,10 @@ public:
std::vector<uint32_t>& child_indexes) override;
static size_t
- GetNumTemplateArguments (const ClangASTType& type);
+ GetNumTemplateArguments (const CompilerType& type);
- static ClangASTType
- GetTemplateArgument (const ClangASTType& type,
+ static CompilerType
+ GetTemplateArgument (const CompilerType& type,
size_t idx,
lldb::TemplateArgumentKind &kind);
@@ -818,28 +818,28 @@ public:
// Modifying RecordType
//----------------------------------------------------------------------
static clang::FieldDecl *
- AddFieldToRecordType (const ClangASTType& type,
+ AddFieldToRecordType (const CompilerType& type,
const char *name,
- const ClangASTType &field_type,
+ const CompilerType &field_type,
lldb::AccessType access,
uint32_t bitfield_bit_size);
static void
- BuildIndirectFields (const ClangASTType& type);
+ BuildIndirectFields (const CompilerType& type);
static void
- SetIsPacked (const ClangASTType& type);
+ SetIsPacked (const CompilerType& type);
static clang::VarDecl *
- AddVariableToRecordType (const ClangASTType& type,
+ AddVariableToRecordType (const CompilerType& type,
const char *name,
- const ClangASTType &var_type,
+ const CompilerType &var_type,
lldb::AccessType access);
clang::CXXMethodDecl *
AddMethodToCXXRecordType (void* type,
const char *name,
- const ClangASTType &method_type,
+ const CompilerType &method_type,
lldb::AccessType access,
bool is_virtual,
bool is_static,
@@ -866,13 +866,13 @@ public:
static bool
- SetObjCSuperClass (const ClangASTType& type,
- const ClangASTType &superclass_clang_type);
+ SetObjCSuperClass (const CompilerType& type,
+ const CompilerType &superclass_clang_type);
static bool
- AddObjCClassProperty (const ClangASTType& type,
+ AddObjCClassProperty (const CompilerType& type,
const char *property_name,
- const ClangASTType &property_clang_type,
+ const CompilerType &property_clang_type,
clang::ObjCIvarDecl *ivar_decl,
const char *property_setter_name,
const char *property_getter_name,
@@ -880,9 +880,9 @@ public:
ClangASTMetadata *metadata);
static clang::ObjCMethodDecl *
- AddMethodToObjCObjectType (const ClangASTType& type,
+ AddMethodToObjCObjectType (const CompilerType& type,
const char *name, // the full symbol name as seen in the symbol table (void* type, "-[NString stringWithCString:]")
- const ClangASTType &method_clang_type,
+ const CompilerType &method_clang_type,
lldb::AccessType access,
bool is_artificial);
@@ -894,17 +894,17 @@ public:
// Tag Declarations
//------------------------------------------------------------------
static bool
- StartTagDeclarationDefinition (const ClangASTType &type);
+ StartTagDeclarationDefinition (const CompilerType &type);
static bool
- CompleteTagDeclarationDefinition (const ClangASTType &type);
+ CompleteTagDeclarationDefinition (const CompilerType &type);
//----------------------------------------------------------------------
// Modifying Enumeration types
//----------------------------------------------------------------------
bool
AddEnumerationValueToEnumerationType (void* type,
- const ClangASTType &enumerator_qual_type,
+ const CompilerType &enumerator_qual_type,
const Declaration &decl,
const char *name,
int64_t enum_value,
@@ -912,7 +912,7 @@ public:
- ClangASTType
+ CompilerType
GetEnumerationIntegerType (void* type);
@@ -922,8 +922,8 @@ public:
// Call this function using the class type when you want to make a
// member pointer type to pointee_type.
- static ClangASTType
- CreateMemberPointerType (const ClangASTType& type, const ClangASTType &pointee_type);
+ static CompilerType
+ CreateMemberPointerType (const CompilerType& type, const CompilerType &pointee_type);
// Converts "s" to a floating point value and place resulting floating
@@ -977,27 +977,27 @@ public:
DumpTypeDescription (void* type, Stream *s) override;
static clang::EnumDecl *
- GetAsEnumDecl (const ClangASTType& type);
+ GetAsEnumDecl (const CompilerType& type);
static clang::RecordDecl *
- GetAsRecordDecl (const ClangASTType& type);
+ GetAsRecordDecl (const CompilerType& type);
clang::CXXRecordDecl *
GetAsCXXRecordDecl (void* type);
static clang::ObjCInterfaceDecl *
- GetAsObjCInterfaceDecl (const ClangASTType& type);
+ GetAsObjCInterfaceDecl (const CompilerType& type);
static clang::QualType
- GetQualType (const ClangASTType& type)
+ GetQualType (const CompilerType& type)
{
if (type && type.GetTypeSystem()->AsClangASTContext())
return clang::QualType::getFromOpaquePtr(type.GetOpaqueQualType());
return clang::QualType();
}
static clang::QualType
- GetCanonicalQualType (const ClangASTType& type)
+ GetCanonicalQualType (const CompilerType& type)
{
if (type && type.GetTypeSystem()->AsClangASTContext())
return clang::QualType::getFromOpaquePtr(type.GetOpaqueQualType()).getCanonicalType();
Removed: lldb/trunk/include/lldb/Symbol/ClangASTType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTType.h?rev=244688&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTType.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTType.h (removed)
@@ -1,462 +0,0 @@
-//===-- ClangASTType.h ------------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_ClangASTType_h_
-#define liblldb_ClangASTType_h_
-
-#include <string>
-#include "lldb/lldb-private.h"
-#include "lldb/Core/ClangForward.h"
-#include "clang/AST/Type.h"
-
-namespace lldb_private {
-
-//----------------------------------------------------------------------
-// A class that can carry around a clang ASTContext and a opaque clang
-// QualType. A clang::QualType can be easily reconstructed from an
-// opaque clang type and often the ASTContext is needed when doing
-// various type related tasks, so this class allows both items to travel
-// in a single very lightweight class that can be used. There are many
-// static equivalents of the member functions that allow the ASTContext
-// and the opaque clang QualType to be specified for ease of use and
-// to avoid code duplication.
-//----------------------------------------------------------------------
-class ClangASTType
-{
-public:
- //----------------------------------------------------------------------
- // Constructors and Destructors
- //----------------------------------------------------------------------
- ClangASTType (TypeSystem *type_system, void *type);
- ClangASTType (clang::ASTContext *ast_context, clang::QualType qual_type);
-
- ClangASTType (const ClangASTType &rhs) :
- m_type (rhs.m_type),
- m_type_system (rhs.m_type_system)
- {
- }
-
- ClangASTType () :
- m_type (0),
- m_type_system (0)
- {
- }
-
- ~ClangASTType();
-
- //----------------------------------------------------------------------
- // Operators
- //----------------------------------------------------------------------
-
- const ClangASTType &
- operator= (const ClangASTType &rhs)
- {
- m_type = rhs.m_type;
- m_type_system = rhs.m_type_system;
- return *this;
- }
-
-
- //----------------------------------------------------------------------
- // Tests
- //----------------------------------------------------------------------
-
- explicit operator bool () const
- {
- return m_type != NULL && m_type_system != NULL;
- }
-
- bool
- operator < (const ClangASTType &rhs) const
- {
- if (m_type_system == rhs.m_type_system)
- return m_type < rhs.m_type;
- return m_type_system < rhs.m_type_system;
- }
-
- bool
- IsValid () const
- {
- return m_type != NULL && m_type_system != NULL;
- }
-
- bool
- IsArrayType (ClangASTType *element_type,
- uint64_t *size,
- bool *is_incomplete) const;
-
- bool
- IsVectorType (ClangASTType *element_type,
- uint64_t *size) const;
-
- bool
- IsArrayOfScalarType () const;
-
- bool
- IsAggregateType () const;
-
- bool
- IsBeingDefined () const;
-
- bool
- IsCharType () const;
-
- bool
- IsCompleteType () const;
-
- bool
- IsConst() const;
-
- bool
- IsCStringType (uint32_t &length) const;
-
- bool
- IsDefined() const;
-
- bool
- IsFloatingPointType (uint32_t &count, bool &is_complex) const;
-
- bool
- IsFunctionType (bool *is_variadic_ptr = NULL) const;
-
- uint32_t
- IsHomogeneousAggregate (ClangASTType* base_type_ptr) const;
-
- size_t
- GetNumberOfFunctionArguments () const;
-
- ClangASTType
- GetFunctionArgumentAtIndex (const size_t index) const;
-
- bool
- IsVariadicFunctionType () const;
-
- bool
- IsFunctionPointerType () const;
-
- bool
- IsIntegerType (bool &is_signed) const;
-
- bool
- IsPolymorphicClass () const;
-
- bool
- IsPossibleCPlusPlusDynamicType (ClangASTType *target_type = NULL) const
- {
- return IsPossibleDynamicType (target_type, true, false);
- }
-
- bool
- IsPossibleDynamicType (ClangASTType *target_type, // Can pass NULL
- bool check_cplusplus,
- bool check_objc) const;
-
-
- bool
- IsPointerToScalarType () const;
-
- bool
- IsRuntimeGeneratedType () const;
-
- bool
- IsPointerType (ClangASTType *pointee_type = NULL) const;
-
- bool
- IsPointerOrReferenceType (ClangASTType *pointee_type = NULL) const;
-
- bool
- IsReferenceType (ClangASTType *pointee_type = nullptr, bool* is_rvalue = nullptr) const;
-
- bool
- IsScalarType () const;
-
- bool
- IsTypedefType () const;
-
- bool
- IsVoidType () const;
-
- //----------------------------------------------------------------------
- // Type Completion
- //----------------------------------------------------------------------
-
- bool
- GetCompleteType () const;
-
- //----------------------------------------------------------------------
- // AST related queries
- //----------------------------------------------------------------------
-
- size_t
- GetPointerByteSize () const;
-
- //----------------------------------------------------------------------
- // Accessors
- //----------------------------------------------------------------------
-
- TypeSystem *
- GetTypeSystem() const
- {
- return m_type_system;
- }
-
- ConstString
- GetConstQualifiedTypeName () const;
-
- ConstString
- GetConstTypeName () const;
-
- ConstString
- GetTypeName () const;
-
- ConstString
- GetDisplayTypeName () const;
-
- uint32_t
- GetTypeInfo (ClangASTType *pointee_or_element_clang_type = NULL) const;
-
- lldb::LanguageType
- GetMinimumLanguage ();
-
- void *
- GetOpaqueQualType() const
- {
- return m_type;
- }
-
- lldb::TypeClass
- GetTypeClass () const;
-
- void
- SetClangType (TypeSystem* type_system, void* type);
- void
- SetClangType (clang::ASTContext *ast, clang::QualType qual_type);
-
- unsigned
- GetTypeQualifiers() const;
-
- //----------------------------------------------------------------------
- // Creating related types
- //----------------------------------------------------------------------
-
- ClangASTType
- GetArrayElementType (uint64_t *stride = nullptr) const;
-
- ClangASTType
- GetCanonicalType () const;
-
- ClangASTType
- GetFullyUnqualifiedType () const;
-
- // Returns -1 if this isn't a function of if the function doesn't have a prototype
- // Returns a value >= 0 if there is a prototype.
- int
- GetFunctionArgumentCount () const;
-
- ClangASTType
- GetFunctionArgumentTypeAtIndex (size_t idx) const;
-
- ClangASTType
- GetFunctionReturnType () const;
-
- size_t
- GetNumMemberFunctions () const;
-
- TypeMemberFunctionImpl
- GetMemberFunctionAtIndex (size_t idx);
-
- ClangASTType
- GetNonReferenceType () const;
-
- ClangASTType
- GetPointeeType () const;
-
- ClangASTType
- GetPointerType () const;
-
- // If the current object represents a typedef type, get the underlying type
- ClangASTType
- GetTypedefedType () const;
-
- ClangASTType
- RemoveFastQualifiers () const;
-
- //----------------------------------------------------------------------
- // Create related types using the current type's AST
- //----------------------------------------------------------------------
- ClangASTType
- GetBasicTypeFromAST (lldb::BasicType basic_type) const;
-
- //----------------------------------------------------------------------
- // Exploring the type
- //----------------------------------------------------------------------
-
- uint64_t
- GetByteSize (ExecutionContextScope *exe_scope) const;
-
- uint64_t
- GetBitSize (ExecutionContextScope *exe_scope) const;
-
- lldb::Encoding
- GetEncoding (uint64_t &count) const;
-
- lldb::Format
- GetFormat () const;
-
- size_t
- GetTypeBitAlign () const;
-
- uint32_t
- GetNumChildren (bool omit_empty_base_classes) const;
-
- lldb::BasicType
- GetBasicTypeEnumeration () const;
-
- static lldb::BasicType
- GetBasicTypeEnumeration (const ConstString &name);
-
- uint32_t
- GetNumFields () const;
-
- ClangASTType
- GetFieldAtIndex (size_t idx,
- std::string& name,
- uint64_t *bit_offset_ptr,
- uint32_t *bitfield_bit_size_ptr,
- bool *is_bitfield_ptr) const;
-
- uint32_t
- GetIndexOfFieldWithName (const char* name,
- ClangASTType* field_clang_type = NULL,
- uint64_t *bit_offset_ptr = NULL,
- uint32_t *bitfield_bit_size_ptr = NULL,
- bool *is_bitfield_ptr = NULL) const;
-
- ClangASTType
- GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
- size_t idx,
- bool transparent_pointers,
- bool omit_empty_base_classes,
- bool ignore_array_bounds,
- std::string& child_name,
- uint32_t &child_byte_size,
- int32_t &child_byte_offset,
- uint32_t &child_bitfield_bit_size,
- uint32_t &child_bitfield_bit_offset,
- bool &child_is_base_class,
- bool &child_is_deref_of_parent,
- ValueObject *valobj) const;
-
- // Lookup a child given a name. This function will match base class names
- // and member member names in "clang_type" only, not descendants.
- uint32_t
- GetIndexOfChildWithName (const char *name,
- bool omit_empty_base_classes) const;
-
- // Lookup a child member given a name. This function will match member names
- // only and will descend into "clang_type" children in search for the first
- // member in this class, or any base class that matches "name".
- // TODO: Return all matches for a given name by returning a vector<vector<uint32_t>>
- // so we catch all names that match a given child name, not just the first.
- size_t
- GetIndexOfChildMemberWithName (const char *name,
- bool omit_empty_base_classes,
- std::vector<uint32_t>& child_indexes) const;
-
- //------------------------------------------------------------------
- // Pointers & References
- //------------------------------------------------------------------
-
- // Converts "s" to a floating point value and place resulting floating
- // point bytes in the "dst" buffer.
- size_t
- ConvertStringToFloatValue (const char *s,
- uint8_t *dst,
- size_t dst_size) const;
- //----------------------------------------------------------------------
- // Dumping types
- //----------------------------------------------------------------------
- void
- DumpValue (ExecutionContext *exe_ctx,
- Stream *s,
- lldb::Format format,
- const DataExtractor &data,
- lldb::offset_t data_offset,
- size_t data_byte_size,
- uint32_t bitfield_bit_size,
- uint32_t bitfield_bit_offset,
- bool show_types,
- bool show_summary,
- bool verbose,
- uint32_t depth);
-
- bool
- DumpTypeValue (Stream *s,
- lldb::Format format,
- const DataExtractor &data,
- lldb::offset_t data_offset,
- size_t data_byte_size,
- uint32_t bitfield_bit_size,
- uint32_t bitfield_bit_offset,
- ExecutionContextScope *exe_scope);
-
- void
- DumpSummary (ExecutionContext *exe_ctx,
- Stream *s,
- const DataExtractor &data,
- lldb::offset_t data_offset,
- size_t data_byte_size);
-
- void
- DumpTypeDescription () const; // Dump to stdout
-
- void
- DumpTypeDescription (Stream *s) const;
-
- bool
- GetValueAsScalar (const DataExtractor &data,
- lldb::offset_t data_offset,
- size_t data_byte_size,
- Scalar &value) const;
-
- bool
- SetValueFromScalar (const Scalar &value,
- Stream &strm);
-
- bool
- ReadFromMemory (ExecutionContext *exe_ctx,
- lldb::addr_t addr,
- AddressType address_type,
- DataExtractor &data);
-
- bool
- WriteToMemory (ExecutionContext *exe_ctx,
- lldb::addr_t addr,
- AddressType address_type,
- StreamString &new_value);
-
- void
- Clear()
- {
- m_type = NULL;
- m_type_system = NULL;
- }
-private:
- void* m_type;
- TypeSystem *m_type_system;
-
-};
-
-bool operator == (const ClangASTType &lhs, const ClangASTType &rhs);
-bool operator != (const ClangASTType &lhs, const ClangASTType &rhs);
-
-
-} // namespace lldb_private
-
-#endif // #ifndef liblldb_ClangASTType_h_
Modified: lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h Tue Aug 11 17:53:00 2015
@@ -22,7 +22,7 @@
// Project includes
#include "lldb/lldb-enumerations.h"
#include "lldb/Core/ClangForward.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangExternalASTSourceCommon.h"
namespace lldb_private {
Copied: lldb/trunk/include/lldb/Symbol/CompilerType.h (from r244679, lldb/trunk/include/lldb/Symbol/ClangASTType.h)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/CompilerType.h?p2=lldb/trunk/include/lldb/Symbol/CompilerType.h&p1=lldb/trunk/include/lldb/Symbol/ClangASTType.h&r1=244679&r2=244689&rev=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTType.h (original)
+++ lldb/trunk/include/lldb/Symbol/CompilerType.h Tue Aug 11 17:53:00 2015
@@ -1,4 +1,4 @@
-//===-- ClangASTType.h ------------------------------------------*- C++ -*-===//
+//===-- CompilerType.h ------------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,13 +7,14 @@
//
//===----------------------------------------------------------------------===//
-#ifndef liblldb_ClangASTType_h_
-#define liblldb_ClangASTType_h_
+#ifndef liblldb_CompilerType_h_
+#define liblldb_CompilerType_h_
#include <string>
+#include <vector>
+
#include "lldb/lldb-private.h"
#include "lldb/Core/ClangForward.h"
-#include "clang/AST/Type.h"
namespace lldb_private {
@@ -27,35 +28,35 @@ namespace lldb_private {
// and the opaque clang QualType to be specified for ease of use and
// to avoid code duplication.
//----------------------------------------------------------------------
-class ClangASTType
+class CompilerType
{
public:
//----------------------------------------------------------------------
// Constructors and Destructors
//----------------------------------------------------------------------
- ClangASTType (TypeSystem *type_system, void *type);
- ClangASTType (clang::ASTContext *ast_context, clang::QualType qual_type);
+ CompilerType (TypeSystem *type_system, void *type);
+ CompilerType (clang::ASTContext *ast_context, clang::QualType qual_type);
- ClangASTType (const ClangASTType &rhs) :
+ CompilerType (const CompilerType &rhs) :
m_type (rhs.m_type),
m_type_system (rhs.m_type_system)
{
}
- ClangASTType () :
+ CompilerType () :
m_type (0),
m_type_system (0)
{
}
- ~ClangASTType();
+ ~CompilerType();
//----------------------------------------------------------------------
// Operators
//----------------------------------------------------------------------
- const ClangASTType &
- operator= (const ClangASTType &rhs)
+ const CompilerType &
+ operator= (const CompilerType &rhs)
{
m_type = rhs.m_type;
m_type_system = rhs.m_type_system;
@@ -73,7 +74,7 @@ public:
}
bool
- operator < (const ClangASTType &rhs) const
+ operator < (const CompilerType &rhs) const
{
if (m_type_system == rhs.m_type_system)
return m_type < rhs.m_type;
@@ -87,12 +88,12 @@ public:
}
bool
- IsArrayType (ClangASTType *element_type,
+ IsArrayType (CompilerType *element_type,
uint64_t *size,
bool *is_incomplete) const;
bool
- IsVectorType (ClangASTType *element_type,
+ IsVectorType (CompilerType *element_type,
uint64_t *size) const;
bool
@@ -126,12 +127,12 @@ public:
IsFunctionType (bool *is_variadic_ptr = NULL) const;
uint32_t
- IsHomogeneousAggregate (ClangASTType* base_type_ptr) const;
+ IsHomogeneousAggregate (CompilerType* base_type_ptr) const;
size_t
GetNumberOfFunctionArguments () const;
- ClangASTType
+ CompilerType
GetFunctionArgumentAtIndex (const size_t index) const;
bool
@@ -147,13 +148,13 @@ public:
IsPolymorphicClass () const;
bool
- IsPossibleCPlusPlusDynamicType (ClangASTType *target_type = NULL) const
+ IsPossibleCPlusPlusDynamicType (CompilerType *target_type = NULL) const
{
return IsPossibleDynamicType (target_type, true, false);
}
bool
- IsPossibleDynamicType (ClangASTType *target_type, // Can pass NULL
+ IsPossibleDynamicType (CompilerType *target_type, // Can pass NULL
bool check_cplusplus,
bool check_objc) const;
@@ -165,13 +166,13 @@ public:
IsRuntimeGeneratedType () const;
bool
- IsPointerType (ClangASTType *pointee_type = NULL) const;
+ IsPointerType (CompilerType *pointee_type = NULL) const;
bool
- IsPointerOrReferenceType (ClangASTType *pointee_type = NULL) const;
+ IsPointerOrReferenceType (CompilerType *pointee_type = NULL) const;
bool
- IsReferenceType (ClangASTType *pointee_type = nullptr, bool* is_rvalue = nullptr) const;
+ IsReferenceType (CompilerType *pointee_type = nullptr, bool* is_rvalue = nullptr) const;
bool
IsScalarType () const;
@@ -219,7 +220,7 @@ public:
GetDisplayTypeName () const;
uint32_t
- GetTypeInfo (ClangASTType *pointee_or_element_clang_type = NULL) const;
+ GetTypeInfo (CompilerType *pointee_or_element_clang_type = NULL) const;
lldb::LanguageType
GetMinimumLanguage ();
@@ -245,13 +246,13 @@ public:
// Creating related types
//----------------------------------------------------------------------
- ClangASTType
+ CompilerType
GetArrayElementType (uint64_t *stride = nullptr) const;
- ClangASTType
+ CompilerType
GetCanonicalType () const;
- ClangASTType
+ CompilerType
GetFullyUnqualifiedType () const;
// Returns -1 if this isn't a function of if the function doesn't have a prototype
@@ -259,10 +260,10 @@ public:
int
GetFunctionArgumentCount () const;
- ClangASTType
+ CompilerType
GetFunctionArgumentTypeAtIndex (size_t idx) const;
- ClangASTType
+ CompilerType
GetFunctionReturnType () const;
size_t
@@ -271,26 +272,26 @@ public:
TypeMemberFunctionImpl
GetMemberFunctionAtIndex (size_t idx);
- ClangASTType
+ CompilerType
GetNonReferenceType () const;
- ClangASTType
+ CompilerType
GetPointeeType () const;
- ClangASTType
+ CompilerType
GetPointerType () const;
// If the current object represents a typedef type, get the underlying type
- ClangASTType
+ CompilerType
GetTypedefedType () const;
- ClangASTType
+ CompilerType
RemoveFastQualifiers () const;
//----------------------------------------------------------------------
// Create related types using the current type's AST
//----------------------------------------------------------------------
- ClangASTType
+ CompilerType
GetBasicTypeFromAST (lldb::BasicType basic_type) const;
//----------------------------------------------------------------------
@@ -324,7 +325,7 @@ public:
uint32_t
GetNumFields () const;
- ClangASTType
+ CompilerType
GetFieldAtIndex (size_t idx,
std::string& name,
uint64_t *bit_offset_ptr,
@@ -333,12 +334,12 @@ public:
uint32_t
GetIndexOfFieldWithName (const char* name,
- ClangASTType* field_clang_type = NULL,
+ CompilerType* field_clang_type = NULL,
uint64_t *bit_offset_ptr = NULL,
uint32_t *bitfield_bit_size_ptr = NULL,
bool *is_bitfield_ptr = NULL) const;
- ClangASTType
+ CompilerType
GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
size_t idx,
bool transparent_pointers,
@@ -453,10 +454,10 @@ private:
};
-bool operator == (const ClangASTType &lhs, const ClangASTType &rhs);
-bool operator != (const ClangASTType &lhs, const ClangASTType &rhs);
+bool operator == (const CompilerType &lhs, const CompilerType &rhs);
+bool operator != (const CompilerType &lhs, const CompilerType &rhs);
} // namespace lldb_private
-#endif // #ifndef liblldb_ClangASTType_h_
+#endif // #ifndef liblldb_CompilerType_h_
Modified: lldb/trunk/include/lldb/Symbol/Function.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Function.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Function.h (original)
+++ lldb/trunk/include/lldb/Symbol/Function.h Tue Aug 11 17:53:00 2015
@@ -573,7 +573,7 @@ public:
const Type*
GetType() const;
- ClangASTType
+ CompilerType
GetClangType ();
uint32_t
Modified: lldb/trunk/include/lldb/Symbol/SymbolFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolFile.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/SymbolFile.h (original)
+++ lldb/trunk/include/lldb/Symbol/SymbolFile.h Tue Aug 11 17:53:00 2015
@@ -12,7 +12,7 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/PluginInterface.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangNamespaceDecl.h"
#include "lldb/Symbol/Type.h"
@@ -129,7 +129,7 @@ public:
virtual size_t ParseTypes (const SymbolContext& sc) = 0;
virtual size_t ParseVariablesForContext (const SymbolContext& sc) = 0;
virtual Type* ResolveTypeUID (lldb::user_id_t type_uid) = 0;
- virtual bool ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type) = 0;
+ virtual bool ResolveClangOpaqueTypeDefinition (CompilerType &clang_type) = 0;
virtual clang::DeclContext* GetClangDeclContextForTypeUID (const lldb_private::SymbolContext &sc, lldb::user_id_t type_uid) { return NULL; }
virtual clang::DeclContext* GetClangDeclContextContainingTypeUID (lldb::user_id_t type_uid) { return NULL; }
virtual uint32_t ResolveSymbolContext (const Address& so_addr, uint32_t resolve_scope, SymbolContext& sc) = 0;
Modified: lldb/trunk/include/lldb/Symbol/TaggedASTType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/TaggedASTType.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/TaggedASTType.h (original)
+++ lldb/trunk/include/lldb/Symbol/TaggedASTType.h Tue Aug 11 17:53:00 2015
@@ -10,33 +10,33 @@
#ifndef liblldb_TaggedASTType_h_
#define liblldb_TaggedASTType_h_
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
namespace lldb_private
{
// For cases in which there are multiple classes of types that are not
// interchangeable, to allow static type checking.
-template <unsigned int C> class TaggedASTType : public ClangASTType
+template <unsigned int C> class TaggedASTType : public CompilerType
{
public:
- TaggedASTType (const ClangASTType &clang_type) :
- ClangASTType(clang_type)
+ TaggedASTType (const CompilerType &clang_type) :
+ CompilerType(clang_type)
{
}
TaggedASTType (void *type, TypeSystem * type_system) :
- ClangASTType(type_system, type)
+ CompilerType(type_system, type)
{
}
TaggedASTType (const TaggedASTType<C> &tw) :
- ClangASTType(tw)
+ CompilerType(tw)
{
}
TaggedASTType () :
- ClangASTType()
+ CompilerType()
{
}
@@ -47,7 +47,7 @@ public:
TaggedASTType<C> &operator= (const TaggedASTType<C> &tw)
{
- ClangASTType::operator= (tw);
+ CompilerType::operator= (tw);
return *this;
}
};
Modified: lldb/trunk/include/lldb/Symbol/Type.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Type.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Type.h (original)
+++ lldb/trunk/include/lldb/Symbol/Type.h Tue Aug 11 17:53:00 2015
@@ -15,7 +15,7 @@
#include "lldb/Core/ConstString.h"
#include "lldb/Core/UserID.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/Declaration.h"
#include "llvm/ADT/APSInt.h"
@@ -93,7 +93,7 @@ public:
lldb::user_id_t encoding_uid,
EncodingDataType encoding_uid_type,
const Declaration& decl,
- const ClangASTType &clang_qual_type,
+ const CompilerType &clang_qual_type,
ResolveState clang_type_resolve_state);
// This makes an invalid type. Used for functions that return a Type when they
@@ -240,18 +240,18 @@ public:
// Get the clang type, and resolve definitions for any
// class/struct/union/enum types completely.
- ClangASTType
+ CompilerType
GetClangFullType ();
// Get the clang type, and resolve definitions enough so that the type could
// have layout performed. This allows ptrs and refs to class/struct/union/enum
// types remain forward declarations.
- ClangASTType
+ CompilerType
GetClangLayoutType ();
// Get the clang type and leave class/struct/union/enum types as forward
// declarations if they haven't already been fully defined.
- ClangASTType
+ CompilerType
GetClangForwardType ();
ClangASTContext &
@@ -276,7 +276,7 @@ public:
uint32_t
GetEncodingMask ();
- ClangASTType
+ CompilerType
CreateClangTypedefType (Type *typedef_type, Type *base_type);
bool
@@ -303,7 +303,7 @@ protected:
EncodingDataType m_encoding_uid_type;
uint64_t m_byte_size;
Declaration m_decl;
- ClangASTType m_clang_type;
+ CompilerType m_clang_type;
struct Flags {
#ifdef __GNUC__
@@ -333,7 +333,7 @@ public:
{
}
- TypePair (ClangASTType type) :
+ TypePair (CompilerType type) :
clang_type(type),
type_sp()
{
@@ -399,7 +399,7 @@ public:
}
void
- SetType (ClangASTType type)
+ SetType (CompilerType type)
{
type_sp.reset();
clang_type = type;
@@ -418,13 +418,13 @@ public:
return type_sp;
}
- ClangASTType
- GetClangASTType () const
+ CompilerType
+ GetCompilerType () const
{
return clang_type;
}
- ClangASTType
+ CompilerType
GetPointerType () const
{
if (type_sp)
@@ -432,7 +432,7 @@ public:
return clang_type.GetPointerType();
}
- ClangASTType
+ CompilerType
GetPointeeType () const
{
if (type_sp)
@@ -440,7 +440,7 @@ public:
return clang_type.GetPointeeType();
}
- ClangASTType
+ CompilerType
GetReferenceType () const
{
if (type_sp)
@@ -448,7 +448,7 @@ public:
return ClangASTContext::GetLValueReferenceType(clang_type);
}
- ClangASTType
+ CompilerType
GetTypedefedType () const
{
if (type_sp)
@@ -456,7 +456,7 @@ public:
return clang_type.GetTypedefedType();
}
- ClangASTType
+ CompilerType
GetDereferencedType () const
{
if (type_sp)
@@ -464,7 +464,7 @@ public:
return clang_type.GetNonReferenceType();
}
- ClangASTType
+ CompilerType
GetUnqualifiedType () const
{
if (type_sp)
@@ -472,7 +472,7 @@ public:
return clang_type.GetFullyUnqualifiedType();
}
- ClangASTType
+ CompilerType
GetCanonicalType () const
{
if (type_sp)
@@ -494,7 +494,7 @@ public:
return lldb::ModuleSP();
}
protected:
- ClangASTType clang_type;
+ CompilerType clang_type;
lldb::TypeSP type_sp;
};
@@ -510,28 +510,28 @@ public:
TypeImpl (const lldb::TypeSP &type_sp);
- TypeImpl (const ClangASTType &clang_type);
+ TypeImpl (const CompilerType &clang_type);
- TypeImpl (const lldb::TypeSP &type_sp, const ClangASTType &dynamic);
+ TypeImpl (const lldb::TypeSP &type_sp, const CompilerType &dynamic);
- TypeImpl (const ClangASTType &clang_type, const ClangASTType &dynamic);
+ TypeImpl (const CompilerType &clang_type, const CompilerType &dynamic);
- TypeImpl (const TypePair &pair, const ClangASTType &dynamic);
+ TypeImpl (const TypePair &pair, const CompilerType &dynamic);
void
SetType (const lldb::TypeSP &type_sp);
void
- SetType (const ClangASTType &clang_type);
+ SetType (const CompilerType &clang_type);
void
- SetType (const lldb::TypeSP &type_sp, const ClangASTType &dynamic);
+ SetType (const lldb::TypeSP &type_sp, const CompilerType &dynamic);
void
- SetType (const ClangASTType &clang_type, const ClangASTType &dynamic);
+ SetType (const CompilerType &clang_type, const CompilerType &dynamic);
void
- SetType (const TypePair &pair, const ClangASTType &dynamic);
+ SetType (const TypePair &pair, const CompilerType &dynamic);
TypeImpl&
operator = (const TypeImpl& rhs);
@@ -576,8 +576,8 @@ public:
TypeImpl
GetCanonicalType() const;
- ClangASTType
- GetClangASTType (bool prefer_dynamic);
+ CompilerType
+ GetCompilerType (bool prefer_dynamic);
TypeSystem *
GetTypeSystem (bool prefer_dynamic);
@@ -593,7 +593,7 @@ private:
lldb::ModuleWP m_module_wp;
TypePair m_static_type;
- ClangASTType m_dynamic_type;
+ CompilerType m_dynamic_type;
};
class TypeListImpl
@@ -751,7 +751,7 @@ class TypeAndOrName
public:
TypeAndOrName ();
TypeAndOrName (lldb::TypeSP &type_sp);
- TypeAndOrName (const ClangASTType &clang_type);
+ TypeAndOrName (const CompilerType &clang_type);
TypeAndOrName (const char *type_str);
TypeAndOrName (const TypeAndOrName &rhs);
TypeAndOrName (ConstString &type_const_string);
@@ -773,10 +773,10 @@ public:
return m_type_pair.GetTypeSP();
}
- ClangASTType
- GetClangASTType () const
+ CompilerType
+ GetCompilerType () const
{
- return m_type_pair.GetClangASTType();
+ return m_type_pair.GetCompilerType();
}
void
@@ -789,7 +789,7 @@ public:
SetTypeSP (lldb::TypeSP type_sp);
void
- SetClangASTType (ClangASTType clang_type);
+ SetCompilerType (CompilerType clang_type);
bool
IsEmpty () const;
@@ -801,12 +801,12 @@ public:
HasTypeSP () const;
bool
- HasClangASTType () const;
+ HasCompilerType () const;
bool
HasType () const
{
- return HasTypeSP() || HasClangASTType();
+ return HasTypeSP() || HasCompilerType();
}
void
@@ -833,7 +833,7 @@ public:
{
}
- TypeMemberFunctionImpl (const ClangASTType& type,
+ TypeMemberFunctionImpl (const CompilerType& type,
const std::string& name,
const lldb::MemberFunctionKind& kind) :
m_type(type),
@@ -870,16 +870,16 @@ public:
ConstString
GetName () const;
- ClangASTType
+ CompilerType
GetType () const;
- ClangASTType
+ CompilerType
GetReturnType () const;
size_t
GetNumArguments () const;
- ClangASTType
+ CompilerType
GetArgumentAtIndex (size_t idx) const;
lldb::MemberFunctionKind
@@ -893,7 +893,7 @@ protected:
GetPrintableTypeName ();
private:
- ClangASTType m_type;
+ CompilerType m_type;
clang::ObjCMethodDecl *m_objc_method_decl;
ConstString m_name;
lldb::MemberFunctionKind m_kind;
@@ -911,7 +911,7 @@ public:
}
TypeEnumMemberImpl (const clang::EnumConstantDecl* enum_member_decl,
- const lldb_private::ClangASTType& integer_type);
+ const lldb_private::CompilerType& integer_type);
TypeEnumMemberImpl (const TypeEnumMemberImpl& rhs) :
m_integer_type_sp(rhs.m_integer_type_sp),
Modified: lldb/trunk/include/lldb/Symbol/TypeSystem.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/TypeSystem.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/TypeSystem.h (original)
+++ lldb/trunk/include/lldb/Symbol/TypeSystem.h Tue Aug 11 17:53:00 2015
@@ -39,7 +39,7 @@ public:
virtual bool
IsArrayType (void * type,
- ClangASTType *element_type,
+ CompilerType *element_type,
uint64_t *size,
bool *is_incomplete) = 0;
@@ -64,7 +64,7 @@ public:
virtual size_t
GetNumberOfFunctionArguments (void * type) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetFunctionArgumentAtIndex (void * type, const size_t index) = 0;
virtual bool
@@ -75,12 +75,12 @@ public:
virtual bool
IsPossibleDynamicType (void * type,
- ClangASTType *target_type, // Can pass NULL
+ CompilerType *target_type, // Can pass NULL
bool check_cplusplus,
bool check_objc) = 0;
virtual bool
- IsPointerType (void * type, ClangASTType *pointee_type) = 0;
+ IsPointerType (void * type, CompilerType *pointee_type) = 0;
virtual bool
IsScalarType (void * type) = 0;
@@ -110,7 +110,7 @@ public:
GetTypeName (void * type) = 0;
virtual uint32_t
- GetTypeInfo (void * type, ClangASTType *pointee_or_element_clang_type) = 0;
+ GetTypeInfo (void * type, CompilerType *pointee_or_element_clang_type) = 0;
virtual lldb::LanguageType
GetMinimumLanguage (void * type) = 0;
@@ -122,10 +122,10 @@ public:
// Creating related types
//----------------------------------------------------------------------
- virtual ClangASTType
+ virtual CompilerType
GetArrayElementType (void * type, uint64_t *stride) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetCanonicalType (void * type) = 0;
// Returns -1 if this isn't a function of if the function doesn't have a prototype
@@ -133,10 +133,10 @@ public:
virtual int
GetFunctionArgumentCount (void * type) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetFunctionArgumentTypeAtIndex (void * type, size_t idx) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetFunctionReturnType (void * type) = 0;
virtual size_t
@@ -145,10 +145,10 @@ public:
virtual TypeMemberFunctionImpl
GetMemberFunctionAtIndex (void * type, size_t idx) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetPointeeType (void * type) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetPointerType (void * type) = 0;
//----------------------------------------------------------------------
@@ -173,7 +173,7 @@ public:
virtual uint32_t
GetNumFields (void * type) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetFieldAtIndex (void * type,
size_t idx,
std::string& name,
@@ -181,7 +181,7 @@ public:
uint32_t *bitfield_bit_size_ptr,
bool *is_bitfield_ptr) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetChildClangTypeAtIndex (void * type,
ExecutionContext *exe_ctx,
size_t idx,
@@ -278,7 +278,7 @@ public:
//----------------------------------------------------------------------
virtual bool
- IsPointerOrReferenceType (void * type, ClangASTType *pointee_type) = 0;
+ IsPointerOrReferenceType (void * type, CompilerType *pointee_type) = 0;
virtual unsigned
GetTypeQualifiers(void * type) = 0;
@@ -289,7 +289,7 @@ public:
virtual size_t
GetTypeBitAlign (void * type) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetBasicTypeFromAST (void * type, lldb::BasicType basic_type) = 0;
virtual bool
@@ -299,7 +299,7 @@ public:
IsConst(void * type) = 0;
virtual uint32_t
- IsHomogeneousAggregate (void * type, ClangASTType* base_type_ptr) = 0;
+ IsHomogeneousAggregate (void * type, CompilerType* base_type_ptr) = 0;
virtual bool
IsPolymorphicClass (void * type) = 0;
@@ -308,22 +308,22 @@ public:
IsTypedefType (void * type) = 0;
// If the current object represents a typedef type, get the underlying type
- virtual ClangASTType
+ virtual CompilerType
GetTypedefedType (void * type) = 0;
virtual bool
IsVectorType (void * type,
- ClangASTType *element_type,
+ CompilerType *element_type,
uint64_t *size) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetFullyUnqualifiedType (void * type) = 0;
- virtual ClangASTType
+ virtual CompilerType
GetNonReferenceType (void * type) = 0;
virtual bool
- IsReferenceType (void * type, ClangASTType *pointee_type, bool* is_rvalue) = 0;
+ IsReferenceType (void * type, CompilerType *pointee_type, bool* is_rvalue) = 0;
};
} // namespace lldb_private
Modified: lldb/trunk/include/lldb/Target/ABI.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ABI.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/ABI.h (original)
+++ lldb/trunk/include/lldb/Target/ABI.h Tue Aug 11 17:53:00 2015
@@ -78,7 +78,7 @@ public:
lldb::ValueObjectSP
GetReturnValueObject (Thread &thread,
- ClangASTType &type,
+ CompilerType &type,
bool persistent = true) const;
// specialized to work with llvm IR types
@@ -95,7 +95,7 @@ protected:
// This is the method the ABI will call to actually calculate the return value.
// Don't put it in a persistent value object, that will be done by the ABI::GetReturnValueObject.
virtual lldb::ValueObjectSP
- GetReturnValueObjectImpl (Thread &thread, ClangASTType &ast_type) const = 0;
+ GetReturnValueObjectImpl (Thread &thread, CompilerType &ast_type) const = 0;
// specialized to work with llvm IR types
virtual lldb::ValueObjectSP
Modified: lldb/trunk/include/lldb/Target/LanguageRuntime.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/LanguageRuntime.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/LanguageRuntime.h (original)
+++ lldb/trunk/include/lldb/Target/LanguageRuntime.h Tue Aug 11 17:53:00 2015
@@ -127,7 +127,7 @@ public:
CreateExceptionSearchFilter ();
virtual bool
- GetTypeBitSize (const ClangASTType& clang_type,
+ GetTypeBitSize (const CompilerType& clang_type,
uint64_t &size)
{
return false;
Modified: lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h (original)
+++ lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h Tue Aug 11 17:53:00 2015
@@ -21,7 +21,7 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/PluginInterface.h"
#include "lldb/Core/ThreadSafeDenseMap.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/DeclVendor.h"
#include "lldb/Symbol/Type.h"
#include "lldb/Target/LanguageRuntime.h"
@@ -247,7 +247,7 @@ public:
struct iVarDescriptor {
ConstString m_name;
- ClangASTType m_type;
+ CompilerType m_type;
uint64_t m_size;
int32_t m_offset;
};
@@ -281,10 +281,10 @@ public:
class EncodingToType
{
public:
- virtual ClangASTType RealizeType (ClangASTContext& ast_ctx, const char* name, bool for_expression);
- virtual ClangASTType RealizeType (const char* name, bool for_expression);
+ virtual CompilerType RealizeType (ClangASTContext& ast_ctx, const char* name, bool for_expression);
+ virtual CompilerType RealizeType (const char* name, bool for_expression);
- virtual ClangASTType RealizeType (clang::ASTContext& ast_ctx, const char* name, bool for_expression) = 0;
+ virtual CompilerType RealizeType (clang::ASTContext& ast_ctx, const char* name, bool for_expression) = 0;
virtual ~EncodingToType();
@@ -440,7 +440,7 @@ public:
// offset, returns LLDB_INVALID_IVAR_OFFSET.
virtual size_t
- GetByteOffsetForIvar (ClangASTType &parent_qual_type, const char *ivar_name);
+ GetByteOffsetForIvar (CompilerType &parent_qual_type, const char *ivar_name);
// Given the name of an Objective-C runtime symbol (e.g., ivar offset symbol),
// try to determine from the runtime what the value of that symbol would be.
@@ -560,7 +560,7 @@ public:
}
bool
- GetTypeBitSize (const ClangASTType& clang_type,
+ GetTypeBitSize (const CompilerType& clang_type,
uint64_t &size) override;
protected:
Modified: lldb/trunk/include/lldb/Target/Target.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Target.h (original)
+++ lldb/trunk/include/lldb/Target/Target.h Tue Aug 11 17:53:00 2015
@@ -824,7 +824,7 @@ public:
lldb::WatchpointSP
CreateWatchpoint (lldb::addr_t addr,
size_t size,
- const ClangASTType *type,
+ const CompilerType *type,
uint32_t kind,
Error &error);
Modified: lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h (original)
+++ lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h Tue Aug 11 17:53:00 2015
@@ -26,11 +26,11 @@ class ThreadPlanCallFunction : public Th
{
// Create a thread plan to call a function at the address passed in the "function"
// argument. If you plan to call GetReturnValueObject, then pass in the
- // return type, otherwise just pass in an invalid ClangASTType.
+ // return type, otherwise just pass in an invalid CompilerType.
public:
ThreadPlanCallFunction (Thread &thread,
const Address &function,
- const ClangASTType &return_type,
+ const CompilerType &return_type,
llvm::ArrayRef<lldb::addr_t> args,
const EvaluateExpressionOptions &options);
@@ -184,7 +184,7 @@ protected:
lldb::addr_t m_stop_address; // This is the address we stopped at. Also set in DoTakedown;
private:
- ClangASTType m_return_type;
+ CompilerType m_return_type;
DISALLOW_COPY_AND_ASSIGN (ThreadPlanCallFunction);
};
Modified: lldb/trunk/include/lldb/Utility/ProcessStructReader.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/ProcessStructReader.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/ProcessStructReader.h (original)
+++ lldb/trunk/include/lldb/Utility/ProcessStructReader.h Tue Aug 11 17:53:00 2015
@@ -16,7 +16,7 @@
#include "lldb/Core/ConstString.h"
#include "lldb/Core/DataExtractor.h"
#include "lldb/Core/Error.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/Process.h"
#include <initializer_list>
@@ -29,7 +29,7 @@ namespace lldb_private {
protected:
struct FieldImpl
{
- ClangASTType type;
+ CompilerType type;
size_t offset;
size_t size;
};
@@ -40,7 +40,7 @@ namespace lldb_private {
size_t m_addr_byte_size;
public:
- ProcessStructReader (Process *process, lldb::addr_t base_addr, ClangASTType struct_type)
+ ProcessStructReader (Process *process, lldb::addr_t base_addr, CompilerType struct_type)
{
if (!process)
return;
@@ -55,7 +55,7 @@ namespace lldb_private {
uint64_t bit_offset;
uint32_t bitfield_bit_size;
bool is_bitfield;
- ClangASTType field_type = struct_type.GetFieldAtIndex(idx,name,&bit_offset,&bitfield_bit_size,&is_bitfield);
+ CompilerType field_type = struct_type.GetFieldAtIndex(idx,name,&bit_offset,&bitfield_bit_size,&is_bitfield);
// no support for bitfields in here (yet)
if (is_bitfield)
return;
Modified: lldb/trunk/include/lldb/lldb-forward.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-forward.h (original)
+++ lldb/trunk/include/lldb/lldb-forward.h Tue Aug 11 17:53:00 2015
@@ -48,7 +48,6 @@ class ClangASTContext;
class ClangASTImporter;
class ClangASTMetadata;
class ClangASTSource;
-class ClangASTType;
class ClangNamespaceDecl;
class ClangExpression;
class ClangExpressionDeclMap;
@@ -68,6 +67,7 @@ class CommandObject;
class CommandReturnObject;
class Communication;
class CompactUnwindInfo;
+class CompilerType;
class CompileUnit;
class Condition;
class Connection;
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Aug 11 17:53:00 2015
@@ -472,7 +472,7 @@
268900CF13353E5F00698AC0 /* SymbolVendorMacOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260C89E210F57C5600BB2B04 /* SymbolVendorMacOSX.cpp */; };
268900D013353E6F00698AC0 /* Block.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7F1310F1B8EC00F91463 /* Block.cpp */; };
268900D113353E6F00698AC0 /* ClangASTContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7F1410F1B8EC00F91463 /* ClangASTContext.cpp */; };
- 268900D213353E6F00698AC0 /* ClangASTType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49E45FAD11F660FE008F7B28 /* ClangASTType.cpp */; };
+ 268900D213353E6F00698AC0 /* CompilerType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49E45FAD11F660FE008F7B28 /* CompilerType.cpp */; };
268900D313353E6F00698AC0 /* ClangExternalASTSourceCallbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26E69030129C6BEF00DDECD9 /* ClangExternalASTSourceCallbacks.cpp */; };
268900D413353E6F00698AC0 /* ClangNamespaceDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266A42D5128E3FFB0090CF7C /* ClangNamespaceDecl.cpp */; };
268900D513353E6F00698AC0 /* CompileUnit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BC7F1510F1B8EC00F91463 /* CompileUnit.cpp */; };
@@ -2270,8 +2270,8 @@
49DCF6FD170E6B4A0092F75E /* IRMemoryMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IRMemoryMap.cpp; path = source/Expression/IRMemoryMap.cpp; sourceTree = "<group>"; };
49DCF6FF170E6FD90092F75E /* Materializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Materializer.h; path = include/lldb/Expression/Materializer.h; sourceTree = "<group>"; };
49DCF700170E70120092F75E /* Materializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Materializer.cpp; path = source/Expression/Materializer.cpp; sourceTree = "<group>"; };
- 49E45FA911F660DC008F7B28 /* ClangASTType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangASTType.h; path = include/lldb/Symbol/ClangASTType.h; sourceTree = "<group>"; };
- 49E45FAD11F660FE008F7B28 /* ClangASTType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClangASTType.cpp; path = source/Symbol/ClangASTType.cpp; sourceTree = "<group>"; };
+ 49E45FA911F660DC008F7B28 /* CompilerType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompilerType.h; path = include/lldb/Symbol/CompilerType.h; sourceTree = "<group>"; };
+ 49E45FAD11F660FE008F7B28 /* CompilerType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CompilerType.cpp; path = source/Symbol/CompilerType.cpp; sourceTree = "<group>"; };
49EC3E98118F90AC00B1265E /* ThreadPlanCallFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPlanCallFunction.cpp; path = source/Target/ThreadPlanCallFunction.cpp; sourceTree = "<group>"; };
49EC3E9C118F90D400B1265E /* ThreadPlanCallFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadPlanCallFunction.h; path = include/lldb/Target/ThreadPlanCallFunction.h; sourceTree = "<group>"; };
49F1A74511B3388F003ED505 /* ClangExpressionDeclMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClangExpressionDeclMap.cpp; path = source/Expression/ClangExpressionDeclMap.cpp; sourceTree = "<group>"; };
@@ -4146,8 +4146,8 @@
26BC7F1410F1B8EC00F91463 /* ClangASTContext.cpp */,
49D8FB3713B5594900411094 /* ClangASTImporter.h */,
49D8FB3513B558DE00411094 /* ClangASTImporter.cpp */,
- 49E45FA911F660DC008F7B28 /* ClangASTType.h */,
- 49E45FAD11F660FE008F7B28 /* ClangASTType.cpp */,
+ 49E45FA911F660DC008F7B28 /* CompilerType.h */,
+ 49E45FAD11F660FE008F7B28 /* CompilerType.cpp */,
495B38431489714C002708C5 /* ClangExternalASTSourceCommon.h */,
4966DCC3148978A10028481B /* ClangExternalASTSourceCommon.cpp */,
26E6902E129C6BD500DDECD9 /* ClangExternalASTSourceCallbacks.h */,
@@ -6262,7 +6262,7 @@
268900D013353E6F00698AC0 /* Block.cpp in Sources */,
268900D113353E6F00698AC0 /* ClangASTContext.cpp in Sources */,
2613F6C81B17B82F00D4DB85 /* CxaDemangle.cpp in Sources */,
- 268900D213353E6F00698AC0 /* ClangASTType.cpp in Sources */,
+ 268900D213353E6F00698AC0 /* CompilerType.cpp in Sources */,
268900D313353E6F00698AC0 /* ClangExternalASTSourceCallbacks.cpp in Sources */,
268900D413353E6F00698AC0 /* ClangNamespaceDecl.cpp in Sources */,
268900D513353E6F00698AC0 /* CompileUnit.cpp in Sources */,
Modified: lldb/trunk/source/API/SBTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTarget.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/API/SBTarget.cpp (original)
+++ lldb/trunk/source/API/SBTarget.cpp Tue Aug 11 17:53:00 2015
@@ -1346,7 +1346,7 @@ SBTarget::WatchAddress (lldb::addr_t add
// Target::CreateWatchpoint() is thread safe.
Error cw_error;
// This API doesn't take in a type, so we can't figure out what it is.
- ClangASTType *type = NULL;
+ CompilerType *type = NULL;
watchpoint_sp = target_sp->CreateWatchpoint(addr, size, type, watch_type, cw_error);
error.SetError(cw_error);
sb_watchpoint.SetSP (watchpoint_sp);
@@ -1400,7 +1400,7 @@ SBTarget::CreateValueFromAddress (const
{
lldb::addr_t load_addr(addr.GetLoadAddress(*this));
ExecutionContext exe_ctx (ExecutionContextRef(ExecutionContext(m_opaque_sp.get(),false)));
- ClangASTType ast_type(type.GetSP()->GetClangASTType(true));
+ CompilerType ast_type(type.GetSP()->GetCompilerType(true));
new_value_sp = ValueObject::CreateValueObjectFromAddress(name, load_addr, exe_ctx, ast_type);
}
sb_value.SetSP(new_value_sp);
@@ -1427,7 +1427,7 @@ SBTarget::CreateValueFromData (const cha
{
DataExtractorSP extractor(*data);
ExecutionContext exe_ctx (ExecutionContextRef(ExecutionContext(m_opaque_sp.get(),false)));
- ClangASTType ast_type(type.GetSP()->GetClangASTType(true));
+ CompilerType ast_type(type.GetSP()->GetCompilerType(true));
new_value_sp = ValueObject::CreateValueObjectFromData(name, *extractor, exe_ctx, ast_type);
}
sb_value.SetSP(new_value_sp);
@@ -1808,7 +1808,7 @@ SBTarget::FindFirstType (const char* typ
if (objc_decl_vendor->FindDecls(const_typename, true, 1, decls) > 0)
{
- if (ClangASTType type = ClangASTContext::GetTypeForDecl(decls[0]))
+ if (CompilerType type = ClangASTContext::GetTypeForDecl(decls[0]))
{
return SBType(type);
}
@@ -1888,7 +1888,7 @@ SBTarget::FindTypes (const char* typenam
{
for (clang::NamedDecl *decl : decls)
{
- if (ClangASTType type = ClangASTContext::GetTypeForDecl(decl))
+ if (CompilerType type = ClangASTContext::GetTypeForDecl(decl))
{
sb_type_list.Append(SBType(type));
}
Modified: lldb/trunk/source/API/SBType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBType.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/API/SBType.cpp (original)
+++ lldb/trunk/source/API/SBType.cpp Tue Aug 11 17:53:00 2015
@@ -15,7 +15,7 @@
#include "lldb/Core/Log.h"
#include "lldb/Core/Stream.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/Type.h"
#include "clang/AST/Decl.h"
@@ -29,8 +29,8 @@ SBType::SBType() :
{
}
-SBType::SBType (const ClangASTType &type) :
- m_opaque_sp(new TypeImpl(ClangASTType(type.GetTypeSystem(),
+SBType::SBType (const CompilerType &type) :
+ m_opaque_sp(new TypeImpl(CompilerType(type.GetTypeSystem(),
type.GetOpaqueQualType())))
{
}
@@ -143,7 +143,7 @@ SBType::GetByteSize()
if (!IsValid())
return 0;
- return m_opaque_sp->GetClangASTType(false).GetByteSize(nullptr);
+ return m_opaque_sp->GetCompilerType(false).GetByteSize(nullptr);
}
@@ -152,7 +152,7 @@ SBType::IsPointerType()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsPointerType();
+ return m_opaque_sp->GetCompilerType(true).IsPointerType();
}
bool
@@ -160,7 +160,7 @@ SBType::IsArrayType()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsArrayType(nullptr, nullptr, nullptr);
+ return m_opaque_sp->GetCompilerType(true).IsArrayType(nullptr, nullptr, nullptr);
}
bool
@@ -168,7 +168,7 @@ SBType::IsVectorType()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsVectorType(nullptr, nullptr);
+ return m_opaque_sp->GetCompilerType(true).IsVectorType(nullptr, nullptr);
}
bool
@@ -176,7 +176,7 @@ SBType::IsReferenceType()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsReferenceType();
+ return m_opaque_sp->GetCompilerType(true).IsReferenceType();
}
SBType
@@ -225,7 +225,7 @@ SBType::GetArrayElementType()
{
if (!IsValid())
return SBType();
- return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetClangASTType(true).GetArrayElementType())));
+ return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetCompilerType(true).GetArrayElementType())));
}
SBType
@@ -234,8 +234,8 @@ SBType::GetVectorElementType ()
SBType type_sb;
if (IsValid())
{
- ClangASTType vector_element_type;
- if (m_opaque_sp->GetClangASTType(true).IsVectorType(&vector_element_type, nullptr))
+ CompilerType vector_element_type;
+ if (m_opaque_sp->GetCompilerType(true).IsVectorType(&vector_element_type, nullptr))
type_sb.SetSP(TypeImplSP(new TypeImpl(vector_element_type)));
}
return type_sb;
@@ -246,7 +246,7 @@ SBType::IsFunctionType ()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsFunctionType();
+ return m_opaque_sp->GetCompilerType(true).IsFunctionType();
}
bool
@@ -254,7 +254,7 @@ SBType::IsPolymorphicClass ()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsPolymorphicClass();
+ return m_opaque_sp->GetCompilerType(true).IsPolymorphicClass();
}
bool
@@ -262,7 +262,7 @@ SBType::IsTypedefType ()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(true).IsTypedefType();
+ return m_opaque_sp->GetCompilerType(true).IsTypedefType();
}
lldb::SBType
@@ -270,7 +270,7 @@ SBType::GetFunctionReturnType ()
{
if (IsValid())
{
- ClangASTType return_clang_type (m_opaque_sp->GetClangASTType(true).GetFunctionReturnType());
+ CompilerType return_clang_type (m_opaque_sp->GetCompilerType(true).GetFunctionReturnType());
if (return_clang_type.IsValid())
return SBType(return_clang_type);
}
@@ -283,7 +283,7 @@ SBType::GetFunctionArgumentTypes ()
SBTypeList sb_type_list;
if (IsValid())
{
- ClangASTType func_type(m_opaque_sp->GetClangASTType(true));
+ CompilerType func_type(m_opaque_sp->GetCompilerType(true));
size_t count = func_type.GetNumberOfFunctionArguments();
for (size_t i = 0;
i < count;
@@ -300,7 +300,7 @@ SBType::GetNumberOfMemberFunctions ()
{
if (IsValid())
{
- return m_opaque_sp->GetClangASTType(true).GetNumMemberFunctions();
+ return m_opaque_sp->GetCompilerType(true).GetNumMemberFunctions();
}
return 0;
}
@@ -310,7 +310,7 @@ SBType::GetMemberFunctionAtIndex (uint32
{
SBTypeMemberFunction sb_func_type;
if (IsValid())
- sb_func_type.reset(new TypeMemberFunctionImpl(m_opaque_sp->GetClangASTType(true).GetMemberFunctionAtIndex(idx)));
+ sb_func_type.reset(new TypeMemberFunctionImpl(m_opaque_sp->GetCompilerType(true).GetMemberFunctionAtIndex(idx)));
return sb_func_type;
}
@@ -335,7 +335,7 @@ lldb::BasicType
SBType::GetBasicType()
{
if (IsValid())
- return m_opaque_sp->GetClangASTType(false).GetBasicTypeEnumeration ();
+ return m_opaque_sp->GetCompilerType(false).GetBasicTypeEnumeration ();
return eBasicTypeInvalid;
}
@@ -356,7 +356,7 @@ uint32_t
SBType::GetNumberOfDirectBaseClasses ()
{
if (IsValid())
- return ClangASTContext::GetNumDirectBaseClasses(m_opaque_sp->GetClangASTType(true));
+ return ClangASTContext::GetNumDirectBaseClasses(m_opaque_sp->GetCompilerType(true));
return 0;
}
@@ -364,7 +364,7 @@ uint32_t
SBType::GetNumberOfVirtualBaseClasses ()
{
if (IsValid())
- return ClangASTContext::GetNumVirtualBaseClasses(m_opaque_sp->GetClangASTType(true));
+ return ClangASTContext::GetNumVirtualBaseClasses(m_opaque_sp->GetCompilerType(true));
return 0;
}
@@ -372,7 +372,7 @@ uint32_t
SBType::GetNumberOfFields ()
{
if (IsValid())
- return m_opaque_sp->GetClangASTType(true).GetNumFields();
+ return m_opaque_sp->GetCompilerType(true).GetNumFields();
return 0;
}
@@ -399,11 +399,11 @@ SBType::GetDirectBaseClassAtIndex (uint3
SBTypeMember sb_type_member;
if (IsValid())
{
- ClangASTType this_type (m_opaque_sp->GetClangASTType (true));
+ CompilerType this_type (m_opaque_sp->GetCompilerType (true));
if (this_type.IsValid())
{
uint32_t bit_offset = 0;
- ClangASTType base_class_type (ClangASTContext::GetDirectBaseClassAtIndex(this_type, idx, &bit_offset));
+ CompilerType base_class_type (ClangASTContext::GetDirectBaseClassAtIndex(this_type, idx, &bit_offset));
if (base_class_type.IsValid())
{
sb_type_member.reset (new TypeMemberImpl (TypeImplSP(new TypeImpl(base_class_type)), bit_offset));
@@ -420,11 +420,11 @@ SBType::GetVirtualBaseClassAtIndex (uint
SBTypeMember sb_type_member;
if (IsValid())
{
- ClangASTType this_type (m_opaque_sp->GetClangASTType (true));
+ CompilerType this_type (m_opaque_sp->GetCompilerType (true));
if (this_type.IsValid())
{
uint32_t bit_offset = 0;
- ClangASTType base_class_type (ClangASTContext::GetVirtualBaseClassAtIndex(this_type, idx, &bit_offset));
+ CompilerType base_class_type (ClangASTContext::GetVirtualBaseClassAtIndex(this_type, idx, &bit_offset));
if (base_class_type.IsValid())
{
sb_type_member.reset (new TypeMemberImpl (TypeImplSP(new TypeImpl(base_class_type)), bit_offset));
@@ -440,14 +440,14 @@ SBType::GetEnumMembers ()
SBTypeEnumMemberList sb_enum_member_list;
if (IsValid())
{
- const clang::EnumDecl *enum_decl = ClangASTContext::GetAsEnumDecl(m_opaque_sp->GetClangASTType(true).GetFullyUnqualifiedType());
+ const clang::EnumDecl *enum_decl = ClangASTContext::GetAsEnumDecl(m_opaque_sp->GetCompilerType(true).GetFullyUnqualifiedType());
if (enum_decl)
{
clang::EnumDecl::enumerator_iterator enum_pos, enum_end_pos;
for (enum_pos = enum_decl->enumerator_begin(), enum_end_pos = enum_decl->enumerator_end(); enum_pos != enum_end_pos; ++enum_pos)
{
SBTypeEnumMember enum_member;
- enum_member.reset(new TypeEnumMemberImpl(*enum_pos, ClangASTType(m_opaque_sp->GetTypeSystem(true), enum_decl->getIntegerType().getAsOpaquePtr())));
+ enum_member.reset(new TypeEnumMemberImpl(*enum_pos, CompilerType(m_opaque_sp->GetTypeSystem(true), enum_decl->getIntegerType().getAsOpaquePtr())));
sb_enum_member_list.Append(enum_member);
}
}
@@ -461,14 +461,14 @@ SBType::GetFieldAtIndex (uint32_t idx)
SBTypeMember sb_type_member;
if (IsValid())
{
- ClangASTType this_type (m_opaque_sp->GetClangASTType (false));
+ CompilerType this_type (m_opaque_sp->GetCompilerType (false));
if (this_type.IsValid())
{
uint64_t bit_offset = 0;
uint32_t bitfield_bit_size = 0;
bool is_bitfield = false;
std::string name_sstr;
- ClangASTType field_type (this_type.GetFieldAtIndex (idx,
+ CompilerType field_type (this_type.GetFieldAtIndex (idx,
name_sstr,
&bit_offset,
&bitfield_bit_size,
@@ -494,7 +494,7 @@ SBType::IsTypeComplete()
{
if (!IsValid())
return false;
- return m_opaque_sp->GetClangASTType(false).IsCompleteType();
+ return m_opaque_sp->GetCompilerType(false).IsCompleteType();
}
uint32_t
@@ -502,7 +502,7 @@ SBType::GetTypeFlags ()
{
if (!IsValid())
return 0;
- return m_opaque_sp->GetClangASTType(true).GetTypeInfo();
+ return m_opaque_sp->GetCompilerType(true).GetTypeInfo();
}
const char*
@@ -525,7 +525,7 @@ lldb::TypeClass
SBType::GetTypeClass ()
{
if (IsValid())
- return m_opaque_sp->GetClangASTType(true).GetTypeClass();
+ return m_opaque_sp->GetCompilerType(true).GetTypeClass();
return lldb::eTypeClassInvalid;
}
@@ -533,7 +533,7 @@ uint32_t
SBType::GetNumberOfTemplateArguments ()
{
if (IsValid())
- return ClangASTContext::GetNumTemplateArguments(m_opaque_sp->GetClangASTType(false));
+ return ClangASTContext::GetNumTemplateArguments(m_opaque_sp->GetCompilerType(false));
return 0;
}
@@ -543,7 +543,7 @@ SBType::GetTemplateArgumentType (uint32_
if (IsValid())
{
TemplateArgumentKind kind = eTemplateArgumentKindNull;
- ClangASTType template_arg_type = ClangASTContext::GetTemplateArgument(m_opaque_sp->GetClangASTType(false), idx, kind);
+ CompilerType template_arg_type = ClangASTContext::GetTemplateArgument(m_opaque_sp->GetCompilerType(false), idx, kind);
if (template_arg_type.IsValid())
return SBType(template_arg_type);
}
@@ -556,7 +556,7 @@ SBType::GetTemplateArgumentKind (uint32_
{
TemplateArgumentKind kind = eTemplateArgumentKindNull;
if (IsValid())
- ClangASTContext::GetTemplateArgument(m_opaque_sp->GetClangASTType(false), idx, kind);
+ ClangASTContext::GetTemplateArgument(m_opaque_sp->GetCompilerType(false), idx, kind);
return kind;
}
Modified: lldb/trunk/source/API/SBTypeEnumMember.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTypeEnumMember.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/API/SBTypeEnumMember.cpp (original)
+++ lldb/trunk/source/API/SBTypeEnumMember.cpp Tue Aug 11 17:53:00 2015
@@ -12,7 +12,7 @@
#include "lldb/API/SBTypeEnumMember.h"
#include "lldb/API/SBStream.h"
#include "lldb/Core/Stream.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/Type.h"
using namespace lldb;
Modified: lldb/trunk/source/API/SBTypeNameSpecifier.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTypeNameSpecifier.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/API/SBTypeNameSpecifier.cpp (original)
+++ lldb/trunk/source/API/SBTypeNameSpecifier.cpp Tue Aug 11 17:53:00 2015
@@ -34,7 +34,7 @@ SBTypeNameSpecifier::SBTypeNameSpecifier
m_opaque_sp()
{
if (type.IsValid())
- m_opaque_sp = TypeNameSpecifierImplSP(new TypeNameSpecifierImpl(type.m_opaque_sp->GetClangASTType(true)));
+ m_opaque_sp = TypeNameSpecifierImplSP(new TypeNameSpecifierImpl(type.m_opaque_sp->GetCompilerType(true)));
}
SBTypeNameSpecifier::SBTypeNameSpecifier (const lldb::SBTypeNameSpecifier &rhs) :
@@ -65,7 +65,7 @@ SBTypeNameSpecifier::GetType ()
{
if (!IsValid())
return SBType();
- lldb_private::ClangASTType c_type = m_opaque_sp->GetClangASTType();
+ lldb_private::CompilerType c_type = m_opaque_sp->GetCompilerType();
if (c_type.IsValid())
return SBType(c_type);
return SBType();
Modified: lldb/trunk/source/API/SBValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBValue.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/API/SBValue.cpp (original)
+++ lldb/trunk/source/API/SBValue.cpp Tue Aug 11 17:53:00 2015
@@ -831,7 +831,7 @@ SBValue::CreateChildAtOffset (const char
TypeImplSP type_sp (type.GetSP());
if (type.IsValid())
{
- sb_value.SetSP(value_sp->GetSyntheticChildAtOffset(offset, type_sp->GetClangASTType(false), true),GetPreferDynamicValue(),GetPreferSyntheticValue(), name);
+ sb_value.SetSP(value_sp->GetSyntheticChildAtOffset(offset, type_sp->GetCompilerType(false), true),GetPreferDynamicValue(),GetPreferSyntheticValue(), name);
}
}
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
@@ -856,7 +856,7 @@ SBValue::Cast (SBType type)
lldb::ValueObjectSP value_sp(GetSP(locker));
TypeImplSP type_sp (type.GetSP());
if (value_sp && type_sp)
- sb_value.SetSP(value_sp->Cast(type_sp->GetClangASTType(false)),GetPreferDynamicValue(),GetPreferSyntheticValue());
+ sb_value.SetSP(value_sp->Cast(type_sp->GetCompilerType(false)),GetPreferDynamicValue(),GetPreferSyntheticValue());
return sb_value;
}
@@ -907,7 +907,7 @@ SBValue::CreateValueFromAddress(const ch
lldb::TypeImplSP type_impl_sp (sb_type.GetSP());
if (value_sp && type_impl_sp)
{
- ClangASTType ast_type(type_impl_sp->GetClangASTType(true));
+ CompilerType ast_type(type_impl_sp->GetCompilerType(true));
ExecutionContext exe_ctx (value_sp->GetExecutionContextRef());
new_value_sp = ValueObject::CreateValueObjectFromAddress(name, address, exe_ctx, ast_type);
}
@@ -936,7 +936,7 @@ SBValue::CreateValueFromData (const char
if (value_sp)
{
ExecutionContext exe_ctx (value_sp->GetExecutionContextRef());
- new_value_sp = ValueObject::CreateValueObjectFromData(name, **data, exe_ctx, type.GetSP()->GetClangASTType(true));
+ new_value_sp = ValueObject::CreateValueObjectFromData(name, **data, exe_ctx, type.GetSP()->GetCompilerType(true));
new_value_sp->SetAddressTypeOfChildren(eAddressTypeLoad);
}
sb_value.SetSP(new_value_sp);
@@ -1812,7 +1812,7 @@ SBValue::Watch (bool resolve_location, b
watch_type |= LLDB_WATCH_TYPE_WRITE;
Error rc;
- ClangASTType type (value_sp->GetClangType());
+ CompilerType type (value_sp->GetClangType());
WatchpointSP watchpoint_sp = target_sp->CreateWatchpoint(addr, byte_size, &type, watch_type, rc);
error.SetError(rc);
Modified: lldb/trunk/source/Breakpoint/Watchpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/Watchpoint.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/Watchpoint.cpp (original)
+++ lldb/trunk/source/Breakpoint/Watchpoint.cpp Tue Aug 11 17:53:00 2015
@@ -27,7 +27,7 @@
using namespace lldb;
using namespace lldb_private;
-Watchpoint::Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const ClangASTType *type, bool hardware) :
+Watchpoint::Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const CompilerType *type, bool hardware) :
StoppointLocation (0, addr, size, hardware),
m_target(target),
m_enabled(false),
Modified: lldb/trunk/source/Commands/CommandObjectArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectArgs.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectArgs.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectArgs.cpp Tue Aug 11 17:53:00 2015
@@ -158,7 +158,7 @@ CommandObjectArgs::DoExecute (Args& args
const char *arg_type_cstr = args.GetArgumentAtIndex(arg_index);
Value value;
value.SetValueType(Value::eValueTypeScalar);
- ClangASTType clang_type;
+ CompilerType clang_type;
char *int_pos;
if ((int_pos = strstr (const_cast<char*>(arg_type_cstr), "int")))
Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Tue Aug 11 17:53:00 2015
@@ -33,7 +33,7 @@
#include "lldb/Interpreter/OptionGroupFormat.h"
#include "lldb/Interpreter/OptionGroupValueObjectDisplay.h"
#include "lldb/Interpreter/OptionGroupVariable.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Tue Aug 11 17:53:00 2015
@@ -400,7 +400,7 @@ protected:
return false;
}
- ClangASTType clang_ast_type;
+ CompilerType clang_ast_type;
Error error;
const char *view_as_type_cstr = m_memory_options.m_view_as_type.GetCurrentValue();
@@ -556,7 +556,7 @@ protected:
while (pointer_count > 0)
{
- ClangASTType pointer_type = clang_ast_type.GetPointerType();
+ CompilerType pointer_type = clang_ast_type.GetPointerType();
if (pointer_type.IsValid())
clang_ast_type = pointer_type;
else
@@ -933,7 +933,7 @@ protected:
OptionGroupReadMemory m_prev_memory_options;
OptionGroupOutputFile m_prev_outfile_options;
OptionGroupValueObjectDisplay m_prev_varobj_options;
- ClangASTType m_prev_clang_ast_type;
+ CompilerType m_prev_clang_ast_type;
};
OptionDefinition
Modified: lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp Tue Aug 11 17:53:00 2015
@@ -1048,7 +1048,7 @@ protected:
valobj_sp = valobj_list.GetValueObjectAtIndex(0);
}
- ClangASTType clang_type;
+ CompilerType clang_type;
if (valobj_sp)
{
@@ -1295,7 +1295,7 @@ protected:
// Fetch the type from the value object, the type of the watched object is the pointee type
/// of the expression, so convert to that if we found a valid type.
- ClangASTType clang_type(valobj_sp->GetClangType());
+ CompilerType clang_type(valobj_sp->GetClangType());
Error error;
Watchpoint *wp = target->CreateWatchpoint(addr, size, &clang_type, watch_type, error).get();
Modified: lldb/trunk/source/Core/Value.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Value.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/Value.cpp (original)
+++ lldb/trunk/source/Core/Value.cpp Tue Aug 11 17:53:00 2015
@@ -18,7 +18,7 @@
#include "lldb/Core/Module.h"
#include "lldb/Core/State.h"
#include "lldb/Core/Stream.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
@@ -275,7 +275,7 @@ Value::GetValueByteSize (Error *error_pt
case eContextTypeLLDBType: // Type *
case eContextTypeVariable: // Variable *
{
- const ClangASTType &ast_type = GetClangType();
+ const CompilerType &ast_type = GetClangType();
if (ast_type.IsValid())
byte_size = ast_type.GetByteSize(nullptr);
}
@@ -297,7 +297,7 @@ Value::GetValueByteSize (Error *error_pt
return byte_size;
}
-const ClangASTType &
+const CompilerType &
Value::GetClangType ()
{
if (!m_clang_type.IsValid())
@@ -336,7 +336,7 @@ Value::GetClangType ()
}
void
-Value::SetClangType (const ClangASTType &clang_type)
+Value::SetClangType (const CompilerType &clang_type)
{
m_clang_type = clang_type;
}
@@ -355,7 +355,7 @@ Value::GetValueDefaultFormat ()
case eContextTypeLLDBType:
case eContextTypeVariable:
{
- const ClangASTType &ast_type = GetClangType();
+ const CompilerType &ast_type = GetClangType();
if (ast_type.IsValid())
return ast_type.GetFormat();
}
@@ -407,7 +407,7 @@ Value::GetValueAsData (ExecutionContext
lldb::addr_t address = LLDB_INVALID_ADDRESS;
AddressType address_type = eAddressTypeFile;
Address file_so_addr;
- const ClangASTType &ast_type = GetClangType();
+ const CompilerType &ast_type = GetClangType();
switch (m_value_type)
{
case eValueTypeVector:
@@ -721,7 +721,7 @@ Value::GetValueAsData (ExecutionContext
Scalar &
Value::ResolveValue(ExecutionContext *exe_ctx)
{
- const ClangASTType &clang_type = GetClangType();
+ const CompilerType &clang_type = GetClangType();
if (clang_type.IsValid())
{
switch (m_value_type)
Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@
#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/Type.h"
@@ -316,16 +316,16 @@ ValueObject::ClearDynamicTypeInformation
m_children_count_valid = false;
m_did_calculate_complete_objc_class_type = false;
m_last_format_mgr_revision = 0;
- m_override_type = ClangASTType();
+ m_override_type = CompilerType();
SetValueFormat(lldb::TypeFormatImplSP());
SetSummaryFormat(lldb::TypeSummaryImplSP());
SetSyntheticChildren(lldb::SyntheticChildrenSP());
}
-ClangASTType
+CompilerType
ValueObject::MaybeCalculateCompleteType ()
{
- ClangASTType clang_type(GetClangTypeImpl());
+ CompilerType clang_type(GetClangTypeImpl());
if (m_did_calculate_complete_objc_class_type)
{
@@ -335,7 +335,7 @@ ValueObject::MaybeCalculateCompleteType
return clang_type;
}
- ClangASTType class_type;
+ CompilerType class_type;
bool is_pointer_type = false;
if (ClangASTContext::IsObjCObjectPointerType(clang_type, &class_type))
@@ -371,7 +371,7 @@ ValueObject::MaybeCalculateCompleteType
if (complete_objc_class_type_sp)
{
- ClangASTType complete_class(complete_objc_class_type_sp->GetClangFullType());
+ CompilerType complete_class(complete_objc_class_type_sp->GetClangFullType());
if (complete_class.GetCompleteType())
{
@@ -395,7 +395,7 @@ ValueObject::MaybeCalculateCompleteType
return clang_type;
}
-ClangASTType
+CompilerType
ValueObject::GetClangType ()
{
return MaybeCalculateCompleteType();
@@ -830,7 +830,7 @@ ValueObject::CreateChildAtIndex (size_t
bool child_is_deref_of_parent = false;
const bool transparent_pointers = synthetic_array_member == false;
- ClangASTType child_clang_type;
+ CompilerType child_clang_type;
ExecutionContext exe_ctx (GetExecutionContextRef());
@@ -937,7 +937,7 @@ ValueObject::GetSummaryAsCString (std::s
bool
ValueObject::IsCStringContainer(bool check_pointer)
{
- ClangASTType pointee_or_element_clang_type;
+ CompilerType pointee_or_element_clang_type;
const Flags type_flags (GetTypeInfo (&pointee_or_element_clang_type));
bool is_char_arr_ptr (type_flags.AnySet (eTypeIsArray | eTypeIsPointer) &&
pointee_or_element_clang_type.IsCharType ());
@@ -958,7 +958,7 @@ ValueObject::GetPointeeData (DataExtract
uint32_t item_idx,
uint32_t item_count)
{
- ClangASTType pointee_or_element_clang_type;
+ CompilerType pointee_or_element_clang_type;
const uint32_t type_info = GetTypeInfo (&pointee_or_element_clang_type);
const bool is_pointer_type = type_info & eTypeIsPointer;
const bool is_array_type = type_info & eTypeIsArray;
@@ -1226,8 +1226,8 @@ ValueObject::ReadPointedString (lldb::Da
size_t bytes_read = 0;
size_t total_bytes_read = 0;
- ClangASTType clang_type = GetClangType();
- ClangASTType elem_or_pointee_clang_type;
+ CompilerType clang_type = GetClangType();
+ CompilerType elem_or_pointee_clang_type;
const Flags type_flags (GetTypeInfo (&elem_or_pointee_clang_type));
if (type_flags.AnySet (eTypeIsArray | eTypeIsPointer) &&
elem_or_pointee_clang_type.IsCharType ())
@@ -1385,7 +1385,7 @@ ValueObject::GetObjectDescription ()
if (runtime == NULL)
{
// Aw, hell, if the things a pointer, or even just an integer, let's try ObjC anyway...
- ClangASTType clang_type = GetClangType();
+ CompilerType clang_type = GetClangType();
if (clang_type)
{
bool is_signed;
@@ -2023,7 +2023,7 @@ ValueObject::GetSyntheticChild (const Co
}
uint32_t
-ValueObject::GetTypeInfo (ClangASTType *pointee_or_element_clang_type)
+ValueObject::GetTypeInfo (CompilerType *pointee_or_element_clang_type)
{
return GetClangType().GetTypeInfo (pointee_or_element_clang_type);
}
@@ -2180,7 +2180,7 @@ ValueObject::GetSyntheticBitFieldChild (
}
ValueObjectSP
-ValueObject::GetSyntheticChildAtOffset(uint32_t offset, const ClangASTType& type, bool can_create)
+ValueObject::GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create)
{
ValueObjectSP synthetic_child_sp;
@@ -2222,7 +2222,7 @@ ValueObject::GetSyntheticChildAtOffset(u
}
ValueObjectSP
-ValueObject::GetSyntheticBase (uint32_t offset, const ClangASTType& type, bool can_create)
+ValueObject::GetSyntheticBase (uint32_t offset, const CompilerType& type, bool can_create)
{
ValueObjectSP synthetic_child_sp;
@@ -2417,7 +2417,7 @@ ValueObject::GetBaseClassPath (Stream &s
if (IsBaseClass())
{
bool parent_had_base_class = GetParent() && GetParent()->GetBaseClassPath (s);
- ClangASTType clang_type = GetClangType();
+ CompilerType clang_type = GetClangType();
std::string cxx_class_name;
bool this_had_base_class = ClangASTContext::GetCXXClassName (clang_type, cxx_class_name);
if (this_had_base_class)
@@ -2536,7 +2536,7 @@ ValueObject::GetExpressionPath (Stream &
ValueObject *non_base_class_parent = GetNonBaseClassParent();
if (non_base_class_parent)
{
- ClangASTType non_base_class_parent_clang_type = non_base_class_parent->GetClangType();
+ CompilerType non_base_class_parent_clang_type = non_base_class_parent->GetClangType();
if (non_base_class_parent_clang_type)
{
if (parent && parent->IsDereferenceOfParent() && epformat == eGetExpressionPathFormatHonorPointers)
@@ -2757,8 +2757,8 @@ ValueObject::GetValueForExpressionPath_I
const char* expression_cstr = *first_unparsed; // hide the top level expression_cstr
- ClangASTType root_clang_type = root->GetClangType();
- ClangASTType pointee_clang_type;
+ CompilerType root_clang_type = root->GetClangType();
+ CompilerType pointee_clang_type;
Flags pointee_clang_type_info;
Flags root_clang_type_info(root_clang_type.GetTypeInfo(&pointee_clang_type));
@@ -3281,8 +3281,8 @@ ValueObject::ExpandArraySliceExpression(
const char* expression_cstr = *first_unparsed; // hide the top level expression_cstr
- ClangASTType root_clang_type = root->GetClangType();
- ClangASTType pointee_clang_type;
+ CompilerType root_clang_type = root->GetClangType();
+ CompilerType pointee_clang_type;
Flags pointee_clang_type_info;
Flags root_clang_type_info(root_clang_type.GetTypeInfo(&pointee_clang_type));
if (pointee_clang_type)
@@ -3677,8 +3677,8 @@ ValueObject::GetQualifiedRepresentationI
lldb::addr_t
ValueObject::GetCPPVTableAddress (AddressType &address_type)
{
- ClangASTType pointee_type;
- ClangASTType this_type(GetClangType());
+ CompilerType pointee_type;
+ CompilerType this_type(GetClangType());
uint32_t type_info = this_type.GetTypeInfo(&pointee_type);
if (type_info)
{
@@ -3726,8 +3726,8 @@ ValueObject::Dereference (Error &error)
bool child_is_base_class = false;
bool child_is_deref_of_parent = false;
const bool transparent_pointers = false;
- ClangASTType clang_type = GetClangType();
- ClangASTType child_clang_type;
+ CompilerType clang_type = GetClangType();
+ CompilerType child_clang_type;
ExecutionContext exe_ctx (GetExecutionContextRef());
@@ -3806,7 +3806,7 @@ ValueObject::AddressOf (Error &error)
case eAddressTypeFile:
case eAddressTypeLoad:
{
- ClangASTType clang_type = GetClangType();
+ CompilerType clang_type = GetClangType();
if (clang_type)
{
std::string name (1, '&');
@@ -3836,13 +3836,13 @@ ValueObject::AddressOf (Error &error)
}
ValueObjectSP
-ValueObject::Cast (const ClangASTType &clang_ast_type)
+ValueObject::Cast (const CompilerType &clang_ast_type)
{
return ValueObjectCast::Create (*this, GetName(), clang_ast_type);
}
ValueObjectSP
-ValueObject::CastPointerType (const char *name, ClangASTType &clang_ast_type)
+ValueObject::CastPointerType (const char *name, CompilerType &clang_ast_type)
{
ValueObjectSP valobj_sp;
AddressType address_type;
@@ -4104,11 +4104,11 @@ lldb::ValueObjectSP
ValueObject::CreateValueObjectFromAddress (const char* name,
uint64_t address,
const ExecutionContext& exe_ctx,
- ClangASTType type)
+ CompilerType type)
{
if (type)
{
- ClangASTType pointer_type(type.GetPointerType());
+ CompilerType pointer_type(type.GetPointerType());
if (pointer_type)
{
lldb::DataBufferSP buffer(new lldb_private::DataBufferHeap(&address,sizeof(lldb::addr_t)));
@@ -4136,7 +4136,7 @@ lldb::ValueObjectSP
ValueObject::CreateValueObjectFromData (const char* name,
const DataExtractor& data,
const ExecutionContext& exe_ctx,
- ClangASTType type)
+ CompilerType type)
{
lldb::ValueObjectSP new_value_sp;
new_value_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(),
@@ -4258,7 +4258,7 @@ ValueObject::CanProvideValue ()
// we need to support invalid types as providers of values because some bare-board
// debugging scenarios have no notion of types, but still manage to have raw numeric
// values for things like registers. sigh.
- const ClangASTType &type(GetClangType());
+ const CompilerType &type(GetClangType());
return (false == type.IsValid()) || (0 != (type.GetTypeInfo() & eTypeHasValue));
}
Modified: lldb/trunk/source/Core/ValueObjectCast.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectCast.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectCast.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectCast.cpp Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/Type.h"
@@ -38,7 +38,7 @@ using namespace lldb_private;
lldb::ValueObjectSP
ValueObjectCast::Create (ValueObject &parent,
const ConstString &name,
- const ClangASTType &cast_type)
+ const CompilerType &cast_type)
{
ValueObjectCast *cast_valobj_ptr = new ValueObjectCast (parent, name, cast_type);
return cast_valobj_ptr->GetSP();
@@ -48,7 +48,7 @@ ValueObjectCast::ValueObjectCast
(
ValueObject &parent,
const ConstString &name,
- const ClangASTType &cast_type
+ const CompilerType &cast_type
) :
ValueObject(parent),
m_cast_type (cast_type)
@@ -62,7 +62,7 @@ ValueObjectCast::~ValueObjectCast()
{
}
-ClangASTType
+CompilerType
ValueObjectCast::GetClangTypeImpl ()
{
return m_cast_type;
@@ -98,7 +98,7 @@ ValueObjectCast::UpdateValue ()
Value old_value(m_value);
m_update_point.SetUpdated();
m_value = m_parent->GetValue();
- ClangASTType clang_type (GetClangType());
+ CompilerType clang_type (GetClangType());
//m_value.SetContext (Value::eContextTypeClangType, clang_type);
m_value.SetClangType (clang_type);
SetAddressTypeOfChildren(m_parent->GetAddressTypeOfChildren());
Modified: lldb/trunk/source/Core/ValueObjectChild.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectChild.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectChild.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectChild.cpp Tue Aug 11 17:53:00 2015
@@ -12,7 +12,7 @@
#include "lldb/Core/Module.h"
#include "lldb/Core/ValueObjectList.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/Type.h"
@@ -27,7 +27,7 @@ using namespace lldb_private;
ValueObjectChild::ValueObjectChild
(
ValueObject &parent,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
uint64_t byte_size,
int32_t byte_offset,
Modified: lldb/trunk/source/Core/ValueObjectConstResult.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResult.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectConstResult.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectConstResult.cpp Tue Aug 11 17:53:00 2015
@@ -16,7 +16,7 @@
#include "lldb/Core/ValueObjectDynamicValue.h"
#include "lldb/Core/ValueObjectList.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/Type.h"
@@ -61,7 +61,7 @@ ValueObjectSP
ValueObjectConstResult::Create
(
ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const DataExtractor &data,
lldb::addr_t address
@@ -75,7 +75,7 @@ ValueObjectConstResult::Create
}
ValueObjectConstResult::ValueObjectConstResult (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const DataExtractor &data,
lldb::addr_t address) :
@@ -103,7 +103,7 @@ ValueObjectConstResult::ValueObjectConst
ValueObjectSP
ValueObjectConstResult::Create (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const lldb::DataBufferSP &data_sp,
lldb::ByteOrder data_byte_order,
@@ -129,7 +129,7 @@ ValueObjectConstResult::Create (Executio
}
ValueObjectConstResult::ValueObjectConstResult (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
const lldb::DataBufferSP &data_sp,
lldb::ByteOrder data_byte_order,
@@ -155,7 +155,7 @@ ValueObjectConstResult::ValueObjectConst
ValueObjectSP
ValueObjectConstResult::Create (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
lldb::addr_t address,
AddressType address_type,
@@ -170,7 +170,7 @@ ValueObjectConstResult::Create (Executio
}
ValueObjectConstResult::ValueObjectConstResult (ExecutionContextScope *exe_scope,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
lldb::addr_t address,
AddressType address_type,
@@ -241,7 +241,7 @@ ValueObjectConstResult::~ValueObjectCons
{
}
-ClangASTType
+CompilerType
ValueObjectConstResult::GetClangTypeImpl()
{
return m_value.GetClangType();
@@ -313,7 +313,7 @@ ValueObjectConstResult::Dereference (Err
}
lldb::ValueObjectSP
-ValueObjectConstResult::GetSyntheticChildAtOffset(uint32_t offset, const ClangASTType& type, bool can_create)
+ValueObjectConstResult::GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create)
{
return m_impl.GetSyntheticChildAtOffset(offset, type, can_create);
}
@@ -366,7 +366,7 @@ ValueObjectConstResult::GetDynamicValue
}
lldb::ValueObjectSP
-ValueObjectConstResult::Cast (const ClangASTType &clang_ast_type)
+ValueObjectConstResult::Cast (const CompilerType &clang_ast_type)
{
return m_impl.Cast(clang_ast_type);
}
Modified: lldb/trunk/source/Core/ValueObjectConstResultCast.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResultCast.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultCast.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectConstResultCast.cpp Tue Aug 11 17:53:00 2015
@@ -19,7 +19,7 @@ using namespace lldb_private;
ValueObjectConstResultCast::ValueObjectConstResultCast(
ValueObject &parent,
const ConstString &name,
- const ClangASTType &cast_type,
+ const CompilerType &cast_type,
lldb::addr_t live_address) :
ValueObjectCast (parent, name, cast_type),
m_impl(this, live_address)
@@ -39,7 +39,7 @@ ValueObjectConstResultCast::Dereference
lldb::ValueObjectSP
ValueObjectConstResultCast::GetSyntheticChildAtOffset(uint32_t offset,
- const ClangASTType& type,
+ const CompilerType& type,
bool can_create)
{
return m_impl.GetSyntheticChildAtOffset(offset, type, can_create);
@@ -69,7 +69,7 @@ ValueObjectConstResultCast::GetPointeeDa
}
lldb::ValueObjectSP
-ValueObjectConstResultCast::Cast (const ClangASTType &clang_ast_type)
+ValueObjectConstResultCast::Cast (const CompilerType &clang_ast_type)
{
return m_impl.Cast(clang_ast_type);
}
Modified: lldb/trunk/source/Core/ValueObjectConstResultChild.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResultChild.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultChild.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectConstResultChild.cpp Tue Aug 11 17:53:00 2015
@@ -19,7 +19,7 @@ using namespace lldb_private;
ValueObjectConstResultChild::ValueObjectConstResultChild
(
ValueObject &parent,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
const ConstString &name,
uint32_t byte_size,
int32_t byte_offset,
@@ -55,7 +55,7 @@ ValueObjectConstResultChild::Dereference
}
lldb::ValueObjectSP
-ValueObjectConstResultChild::GetSyntheticChildAtOffset(uint32_t offset, const ClangASTType& type, bool can_create)
+ValueObjectConstResultChild::GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create)
{
return m_impl.GetSyntheticChildAtOffset(offset, type, can_create);
}
@@ -81,7 +81,7 @@ ValueObjectConstResultChild::GetPointeeD
}
lldb::ValueObjectSP
-ValueObjectConstResultChild::Cast (const ClangASTType &clang_ast_type)
+ValueObjectConstResultChild::Cast (const CompilerType &clang_ast_type)
{
return m_impl.Cast(clang_ast_type);
}
Modified: lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp Tue Aug 11 17:53:00 2015
@@ -18,7 +18,7 @@
#include "lldb/Core/Module.h"
#include "lldb/Core/ValueObjectList.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/Type.h"
@@ -71,8 +71,8 @@ ValueObjectConstResultImpl::CreateChildA
bool child_is_deref_of_parent = false;
const bool transparent_pointers = synthetic_array_member == false;
- ClangASTType clang_type = m_impl_backend->GetClangType();
- ClangASTType child_clang_type;
+ CompilerType clang_type = m_impl_backend->GetClangType();
+ CompilerType child_clang_type;
ExecutionContext exe_ctx (m_impl_backend->GetExecutionContextRef());
@@ -114,7 +114,7 @@ ValueObjectConstResultImpl::CreateChildA
}
lldb::ValueObjectSP
-ValueObjectConstResultImpl::GetSyntheticChildAtOffset (uint32_t offset, const ClangASTType& type, bool can_create)
+ValueObjectConstResultImpl::GetSyntheticChildAtOffset (uint32_t offset, const CompilerType& type, bool can_create)
{
if (m_impl_backend == NULL)
return lldb::ValueObjectSP();
@@ -132,7 +132,7 @@ ValueObjectConstResultImpl::AddressOf (E
return lldb::ValueObjectSP();
if (m_live_address != LLDB_INVALID_ADDRESS)
{
- ClangASTType clang_type(m_impl_backend->GetClangType());
+ CompilerType clang_type(m_impl_backend->GetClangType());
lldb::DataBufferSP buffer(new lldb_private::DataBufferHeap(&m_live_address,sizeof(lldb::addr_t)));
@@ -156,7 +156,7 @@ ValueObjectConstResultImpl::AddressOf (E
}
lldb::ValueObjectSP
-ValueObjectConstResultImpl::Cast (const ClangASTType &clang_ast_type)
+ValueObjectConstResultImpl::Cast (const CompilerType &clang_ast_type)
{
if (m_impl_backend == NULL)
return lldb::ValueObjectSP();
Modified: lldb/trunk/source/Core/ValueObjectDynamicValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectDynamicValue.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectDynamicValue.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectDynamicValue.cpp Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/Type.h"
@@ -49,7 +49,7 @@ ValueObjectDynamicValue::~ValueObjectDyn
m_owning_valobj_sp.reset();
}
-ClangASTType
+CompilerType
ValueObjectDynamicValue::GetClangTypeImpl ()
{
const bool success = UpdateValueIfNeeded(false);
@@ -149,13 +149,13 @@ FixupTypeAndOrName (const TypeAndOrName&
// The type will always be the type of the dynamic object. If our parent's type was a pointer,
// then our type should be a pointer to the type of the dynamic object. If a reference, then the original type
// should be okay...
- ClangASTType orig_type = type_andor_name.GetClangASTType();
- ClangASTType corrected_type = orig_type;
+ CompilerType orig_type = type_andor_name.GetCompilerType();
+ CompilerType corrected_type = orig_type;
if (parent.IsPointerType())
corrected_type = orig_type.GetPointerType ();
else if (parent.IsPointerOrReferenceType())
corrected_type = ClangASTContext::GetLValueReferenceType(orig_type);
- ret.SetClangASTType(corrected_type);
+ ret.SetCompilerType(corrected_type);
}
else /*if (m_dynamic_type_info.HasName())*/
{
@@ -166,7 +166,7 @@ FixupTypeAndOrName (const TypeAndOrName&
else if (parent.IsPointerOrReferenceType())
corrected_name.append(" &");
// the parent type should be a correctly pointer'ed or referenc'ed type
- ret.SetClangASTType(parent.GetClangType());
+ ret.SetCompilerType(parent.GetClangType());
ret.SetName(corrected_name.c_str());
}
return ret;
@@ -241,7 +241,7 @@ ValueObjectDynamicValue::UpdateValue ()
{
if (class_type_or_name.HasType())
{
- m_type_impl = TypeImpl(m_parent->GetClangType(),FixupTypeAndOrName(class_type_or_name, *m_parent).GetClangASTType());
+ m_type_impl = TypeImpl(m_parent->GetClangType(),FixupTypeAndOrName(class_type_or_name, *m_parent).GetCompilerType());
}
else
{
@@ -303,7 +303,7 @@ ValueObjectDynamicValue::UpdateValue ()
m_dynamic_type_info = FixupTypeAndOrName(m_dynamic_type_info, *m_parent);
//m_value.SetContext (Value::eContextTypeClangType, corrected_type);
- m_value.SetClangType (m_dynamic_type_info.GetClangASTType());
+ m_value.SetClangType (m_dynamic_type_info.GetCompilerType());
// Our address is the location of the dynamic type stored in memory. It isn't a load address,
// because we aren't pointing to the LOCATION that stores the pointer to us, we're pointing to us...
Modified: lldb/trunk/source/Core/ValueObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectMemory.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectMemory.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectMemory.cpp Tue Aug 11 17:53:00 2015
@@ -46,7 +46,7 @@ ValueObjectSP
ValueObjectMemory::Create (ExecutionContextScope *exe_scope,
const char *name,
const Address &address,
- const ClangASTType &ast_type)
+ const CompilerType &ast_type)
{
return (new ValueObjectMemory (exe_scope, name, address, ast_type))->GetSP();
}
@@ -90,7 +90,7 @@ ValueObjectMemory::ValueObjectMemory (Ex
ValueObjectMemory::ValueObjectMemory (ExecutionContextScope *exe_scope,
const char *name,
const Address &address,
- const ClangASTType &ast_type) :
+ const CompilerType &ast_type) :
ValueObject(exe_scope),
m_address (address),
m_type_sp(),
@@ -131,7 +131,7 @@ ValueObjectMemory::~ValueObjectMemory()
{
}
-ClangASTType
+CompilerType
ValueObjectMemory::GetClangTypeImpl ()
{
if (m_type_sp)
Modified: lldb/trunk/source/Core/ValueObjectRegister.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectRegister.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectRegister.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectRegister.cpp Tue Aug 11 17:53:00 2015
@@ -15,7 +15,7 @@
// Other libraries and framework includes
// Project includes
#include "lldb/Core/Module.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/TypeList.h"
#include "lldb/Target/ExecutionContext.h"
@@ -42,10 +42,10 @@ ValueObjectRegisterContext::~ValueObject
{
}
-ClangASTType
+CompilerType
ValueObjectRegisterContext::GetClangTypeImpl ()
{
- return ClangASTType();
+ return CompilerType();
}
ConstString
@@ -144,10 +144,10 @@ ValueObjectRegisterSet::~ValueObjectRegi
{
}
-ClangASTType
+CompilerType
ValueObjectRegisterSet::GetClangTypeImpl ()
{
- return ClangASTType();
+ return CompilerType();
}
ConstString
@@ -307,7 +307,7 @@ ValueObjectRegister::~ValueObjectRegiste
{
}
-ClangASTType
+CompilerType
ValueObjectRegister::GetClangTypeImpl ()
{
if (!m_clang_type.IsValid())
Modified: lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp Tue Aug 11 17:53:00 2015
@@ -82,7 +82,7 @@ ValueObjectSynthetic::~ValueObjectSynthe
{
}
-ClangASTType
+CompilerType
ValueObjectSynthetic::GetClangTypeImpl ()
{
return m_parent->GetClangType();
Modified: lldb/trunk/source/Core/ValueObjectVariable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectVariable.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectVariable.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectVariable.cpp Tue Aug 11 17:53:00 2015
@@ -54,13 +54,13 @@ ValueObjectVariable::~ValueObjectVariabl
{
}
-ClangASTType
+CompilerType
ValueObjectVariable::GetClangTypeImpl ()
{
Type *var_type = m_variable_sp->GetType();
if (var_type)
return var_type->GetClangForwardType();
- return ClangASTType();
+ return CompilerType();
}
ConstString
@@ -93,7 +93,7 @@ ValueObjectVariable::GetQualifiedTypeNam
size_t
ValueObjectVariable::CalculateNumChildren()
{
- ClangASTType type(GetClangType());
+ CompilerType type(GetClangType());
if (!type.IsValid())
return 0;
@@ -107,7 +107,7 @@ ValueObjectVariable::GetByteSize()
{
ExecutionContext exe_ctx(GetExecutionContextRef());
- ClangASTType type(GetClangType());
+ CompilerType type(GetClangType());
if (!type.IsValid())
return 0;
@@ -168,7 +168,7 @@ ValueObjectVariable::UpdateValue ()
m_resolved_value = m_value;
m_value.SetContext(Value::eContextTypeVariable, variable);
- ClangASTType clang_type = GetClangType();
+ CompilerType clang_type = GetClangType();
if (clang_type.IsValid())
m_value.SetClangType(clang_type);
Modified: lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp (original)
+++ lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp Tue Aug 11 17:53:00 2015
@@ -318,7 +318,7 @@ lldb_private::formatters::WCharStringSum
if (!ast)
return false;
- ClangASTType wchar_clang_type = ClangASTContext::GetBasicType(ast, lldb::eBasicTypeWChar);
+ CompilerType wchar_clang_type = ClangASTContext::GetBasicType(ast, lldb::eBasicTypeWChar);
const uint32_t wchar_size = wchar_clang_type.GetBitSize(nullptr); // Safe to pass NULL for exe_scope here
ReadStringAndDumpToStreamOptions options(valobj);
@@ -772,7 +772,7 @@ lldb_private::formatters::NSTaggedString
return true;
}
-static ClangASTType
+static CompilerType
GetNSPathStore2Type (Target &target)
{
static ConstString g_type_name("__lldb_autogen_nspathstore2");
@@ -780,10 +780,10 @@ GetNSPathStore2Type (Target &target)
ClangASTContext *ast_ctx = target.GetScratchClangASTContext();
if (!ast_ctx)
- return ClangASTType();
+ return CompilerType();
- ClangASTType voidstar = ast_ctx->GetBasicType(lldb::eBasicTypeVoid).GetPointerType();
- ClangASTType uint32 = ast_ctx->GetIntTypeFromBitSize(32, false);
+ CompilerType voidstar = ast_ctx->GetBasicType(lldb::eBasicTypeVoid).GetPointerType();
+ CompilerType uint32 = ast_ctx->GetIntTypeFromBitSize(32, false);
return ast_ctx->GetOrCreateStructForIdentifier(g_type_name, {
{"isa",voidstar},
@@ -1034,7 +1034,7 @@ lldb_private::formatters::NSAttributedSt
if (!pointer_value)
return false;
pointer_value += addr_size;
- ClangASTType type(valobj.GetClangType());
+ CompilerType type(valobj.GetClangType());
ExecutionContext exe_ctx(target_sp,false);
ValueObjectSP child_ptr_sp(valobj.CreateValueObjectFromAddress("string_ptr", pointer_value, exe_ctx, type));
if (!child_ptr_sp)
@@ -1100,7 +1100,7 @@ lldb_private::formatters::ObjCSELSummary
{
lldb::ValueObjectSP valobj_sp;
- ClangASTType charstar (valobj.GetClangType().GetBasicTypeFromAST(eBasicTypeChar).GetPointerType());
+ CompilerType charstar (valobj.GetClangType().GetBasicTypeFromAST(eBasicTypeChar).GetPointerType());
if (!charstar)
return false;
Modified: lldb/trunk/source/DataFormatters/Cocoa.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/Cocoa.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/Cocoa.cpp (original)
+++ lldb/trunk/source/DataFormatters/Cocoa.cpp Tue Aug 11 17:53:00 2015
@@ -443,7 +443,7 @@ lldb_private::formatters::NSURLSummaryPr
{
uint64_t offset_text = ptr_size + ptr_size + 8; // ISA + pointer + 8 bytes of data (even on 32bit)
uint64_t offset_base = offset_text + ptr_size;
- ClangASTType type(valobj.GetClangType());
+ CompilerType type(valobj.GetClangType());
ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset_text, type, true));
ValueObjectSP base(valobj.GetSyntheticChildAtOffset(offset_base, type, true));
if (!text)
Modified: lldb/trunk/source/DataFormatters/FormatManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/FormatManager.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/FormatManager.cpp (original)
+++ lldb/trunk/source/DataFormatters/FormatManager.cpp Tue Aug 11 17:53:00 2015
@@ -162,7 +162,7 @@ FormatManager::GetFormatAsCString (Forma
void
FormatManager::GetPossibleMatches (ValueObject& valobj,
- ClangASTType clang_type,
+ CompilerType clang_type,
uint32_t reason,
lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries,
@@ -189,7 +189,7 @@ FormatManager::GetPossibleMatches (Value
for (bool is_rvalue_ref = true, j = true; j && clang_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false)
{
- ClangASTType non_ref_type = clang_type.GetNonReferenceType();
+ CompilerType non_ref_type = clang_type.GetNonReferenceType();
GetPossibleMatches(valobj,
non_ref_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@@ -200,7 +200,7 @@ FormatManager::GetPossibleMatches (Value
did_strip_typedef);
if (non_ref_type.IsTypedefType())
{
- ClangASTType deffed_referenced_type = non_ref_type.GetTypedefedType();
+ CompilerType deffed_referenced_type = non_ref_type.GetTypedefedType();
deffed_referenced_type = is_rvalue_ref ? ClangASTContext::GetRValueReferenceType(deffed_referenced_type) : ClangASTContext::GetLValueReferenceType(deffed_referenced_type);
GetPossibleMatches(valobj,
deffed_referenced_type,
@@ -215,7 +215,7 @@ FormatManager::GetPossibleMatches (Value
if (clang_type.IsPointerType())
{
- ClangASTType non_ptr_type = clang_type.GetPointeeType();
+ CompilerType non_ptr_type = clang_type.GetPointeeType();
GetPossibleMatches(valobj,
non_ptr_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@@ -226,7 +226,7 @@ FormatManager::GetPossibleMatches (Value
did_strip_typedef);
if (non_ptr_type.IsTypedefType())
{
- ClangASTType deffed_pointed_type = non_ptr_type.GetTypedefedType().GetPointerType();
+ CompilerType deffed_pointed_type = non_ptr_type.GetTypedefedType().GetPointerType();
GetPossibleMatches(valobj,
deffed_pointed_type,
reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
@@ -261,7 +261,7 @@ FormatManager::GetPossibleMatches (Value
} while (false);
}
- ClangASTType non_ptr_type = clang_type.GetPointeeType();
+ CompilerType non_ptr_type = clang_type.GetPointeeType();
GetPossibleMatches(valobj,
non_ptr_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@@ -275,7 +275,7 @@ FormatManager::GetPossibleMatches (Value
// try to strip typedef chains
if (clang_type.IsTypedefType())
{
- ClangASTType deffed_type = clang_type.GetTypedefedType();
+ CompilerType deffed_type = clang_type.GetTypedefedType();
GetPossibleMatches(valobj,
deffed_type,
reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
@@ -292,7 +292,7 @@ FormatManager::GetPossibleMatches (Value
if (!clang_type.IsValid())
break;
- ClangASTType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType();
+ CompilerType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType();
if (!unqual_clang_ast_type.IsValid())
break;
if (unqual_clang_ast_type.GetOpaqueQualType() != clang_type.GetOpaqueQualType())
Modified: lldb/trunk/source/DataFormatters/LibCxxInitializerList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/LibCxxInitializerList.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/LibCxxInitializerList.cpp (original)
+++ lldb/trunk/source/DataFormatters/LibCxxInitializerList.cpp Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@ namespace lldb_private {
~LibcxxInitializerListSyntheticFrontEnd ();
private:
ValueObject* m_start;
- ClangASTType m_element_type;
+ CompilerType m_element_type;
uint32_t m_element_size;
size_t m_num_elements;
std::map<size_t,lldb::ValueObjectSP> m_children;
Modified: lldb/trunk/source/DataFormatters/LibCxxList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/LibCxxList.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/LibCxxList.cpp (original)
+++ lldb/trunk/source/DataFormatters/LibCxxList.cpp Tue Aug 11 17:53:00 2015
@@ -57,7 +57,7 @@ namespace lldb_private {
lldb::addr_t m_node_address;
ValueObject* m_head;
ValueObject* m_tail;
- ClangASTType m_element_type;
+ CompilerType m_element_type;
size_t m_count;
std::map<size_t,lldb::ValueObjectSP> m_children;
};
@@ -332,7 +332,7 @@ lldb_private::formatters::LibcxxStdListS
ValueObjectSP impl_sp(m_backend.GetChildMemberWithName(ConstString("__end_"),true));
if (!impl_sp)
return false;
- ClangASTType list_type = m_backend.GetClangType();
+ CompilerType list_type = m_backend.GetClangType();
if (list_type.IsReferenceType())
list_type = list_type.GetNonReferenceType();
Modified: lldb/trunk/source/DataFormatters/LibCxxMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/LibCxxMap.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/LibCxxMap.cpp (original)
+++ lldb/trunk/source/DataFormatters/LibCxxMap.cpp Tue Aug 11 17:53:00 2015
@@ -56,7 +56,7 @@ namespace lldb_private {
ValueObject* m_tree;
ValueObject* m_root_node;
- ClangASTType m_element_type;
+ CompilerType m_element_type;
uint32_t m_skip_size;
size_t m_count;
std::map<size_t,lldb::ValueObjectSP> m_children;
@@ -301,7 +301,7 @@ lldb_private::formatters::LibcxxStdMapSy
return;
if (!node)
return;
- ClangASTType node_type(node->GetClangType());
+ CompilerType node_type(node->GetClangType());
uint64_t bit_offset;
if (node_type.GetIndexOfFieldWithName("__value_", NULL, &bit_offset) == UINT32_MAX)
return;
Modified: lldb/trunk/source/DataFormatters/LibCxxVector.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/LibCxxVector.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/LibCxxVector.cpp (original)
+++ lldb/trunk/source/DataFormatters/LibCxxVector.cpp Tue Aug 11 17:53:00 2015
@@ -43,7 +43,7 @@ namespace lldb_private {
private:
ValueObject* m_start;
ValueObject* m_finish;
- ClangASTType m_element_type;
+ CompilerType m_element_type;
uint32_t m_element_size;
std::map<size_t,lldb::ValueObjectSP> m_children;
};
Modified: lldb/trunk/source/DataFormatters/LibStdcpp.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/LibStdcpp.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/LibStdcpp.cpp (original)
+++ lldb/trunk/source/DataFormatters/LibStdcpp.cpp Tue Aug 11 17:53:00 2015
@@ -78,11 +78,11 @@ lldb_private::formatters::LibstdcppMapIt
m_pair_address += (is_64bit ? 32 : 16);
- ClangASTType my_type(valobj_sp->GetClangType());
+ CompilerType my_type(valobj_sp->GetClangType());
if (ClangASTContext::GetNumTemplateArguments(my_type) >= 1)
{
TemplateArgumentKind kind;
- ClangASTType pair_type = ClangASTContext::GetTemplateArgument(my_type, 0, kind);
+ CompilerType pair_type = ClangASTContext::GetTemplateArgument(my_type, 0, kind);
if (kind != eTemplateArgumentKindType && kind != eTemplateArgumentKindTemplate && kind != eTemplateArgumentKindTemplateExpansion)
return false;
m_pair_type = pair_type;
Modified: lldb/trunk/source/DataFormatters/NSArray.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/NSArray.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/NSArray.cpp (original)
+++ lldb/trunk/source/DataFormatters/NSArray.cpp Tue Aug 11 17:53:00 2015
@@ -66,7 +66,7 @@ namespace lldb_private {
ExecutionContextRef m_exe_ctx_ref;
uint8_t m_ptr_size;
- ClangASTType m_id_type;
+ CompilerType m_id_type;
std::vector<lldb::ValueObjectSP> m_children;
};
@@ -195,7 +195,7 @@ namespace lldb_private {
uint8_t m_ptr_size;
uint64_t m_items;
lldb::addr_t m_data_ptr;
- ClangASTType m_id_type;
+ CompilerType m_id_type;
std::vector<lldb::ValueObjectSP> m_children;
};
@@ -300,7 +300,7 @@ m_children()
{
clang::ASTContext *ast = valobj_sp->GetExecutionContextRef().GetTargetSP()->GetScratchClangASTContext()->getASTContext();
if (ast)
- m_id_type = ClangASTType(ast, ast->ObjCBuiltinIdTy);
+ m_id_type = CompilerType(ast, ast->ObjCBuiltinIdTy);
if (valobj_sp->GetProcessSP())
m_ptr_size = valobj_sp->GetProcessSP()->GetAddressByteSize();
}
@@ -532,7 +532,7 @@ lldb_private::formatters::NSArrayISynthe
{
ClangASTContext *ast = valobj_sp->GetClangType().GetTypeSystem()->AsClangASTContext();
if (ast)
- m_id_type = ClangASTType(ast->getASTContext(), ast->getASTContext()->ObjCBuiltinIdTy);
+ m_id_type = CompilerType(ast->getASTContext(), ast->getASTContext()->ObjCBuiltinIdTy);
}
}
@@ -622,7 +622,7 @@ SyntheticChildrenFrontEnd* lldb_private:
if (!runtime)
return NULL;
- ClangASTType valobj_type(valobj_sp->GetClangType());
+ CompilerType valobj_type(valobj_sp->GetClangType());
Flags flags(valobj_type.GetTypeInfo());
if (flags.IsClear(eTypeIsPointer))
Modified: lldb/trunk/source/DataFormatters/NSDictionary.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/NSDictionary.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/NSDictionary.cpp (original)
+++ lldb/trunk/source/DataFormatters/NSDictionary.cpp Tue Aug 11 17:53:00 2015
@@ -25,10 +25,10 @@ using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::formatters;
-static ClangASTType
+static CompilerType
GetLLDBNSPairType (TargetSP target_sp)
{
- ClangASTType clang_type;
+ CompilerType clang_type;
ClangASTContext *target_ast_context = target_sp->GetScratchClangASTContext();
@@ -45,7 +45,7 @@ GetLLDBNSPairType (TargetSP target_sp)
if (clang_type)
{
ClangASTContext::StartTagDeclarationDefinition(clang_type);
- ClangASTType id_clang_type = target_ast_context->GetBasicType (eBasicTypeObjCID);
+ CompilerType id_clang_type = target_ast_context->GetBasicType (eBasicTypeObjCID);
ClangASTContext::AddFieldToRecordType(clang_type, "key", id_clang_type, lldb::eAccessPublic, 0);
ClangASTContext::AddFieldToRecordType(clang_type, "value", id_clang_type, lldb::eAccessPublic, 0);
ClangASTContext::CompleteTagDeclarationDefinition(clang_type);
@@ -105,7 +105,7 @@ namespace lldb_private {
DataDescriptor_32 *m_data_32;
DataDescriptor_64 *m_data_64;
lldb::addr_t m_data_ptr;
- ClangASTType m_pair_type;
+ CompilerType m_pair_type;
std::vector<DictionaryItemDescriptor> m_children;
};
@@ -162,7 +162,7 @@ namespace lldb_private {
lldb::ByteOrder m_order;
DataDescriptor_32 *m_data_32;
DataDescriptor_64 *m_data_64;
- ClangASTType m_pair_type;
+ CompilerType m_pair_type;
std::vector<DictionaryItemDescriptor> m_children;
};
Modified: lldb/trunk/source/DataFormatters/NSIndexPath.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/NSIndexPath.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/NSIndexPath.cpp (original)
+++ lldb/trunk/source/DataFormatters/NSIndexPath.cpp Tue Aug 11 17:53:00 2015
@@ -179,7 +179,7 @@ protected:
}
lldb::ValueObjectSP
- GetIndexAtIndex (size_t idx, const ClangASTType& desired_type)
+ GetIndexAtIndex (size_t idx, const CompilerType& desired_type)
{
if (idx >= GetNumIndexes())
return nullptr;
@@ -209,7 +209,7 @@ protected:
}
lldb::ValueObjectSP
- GetIndexAtIndex (size_t idx, const ClangASTType& desired_type)
+ GetIndexAtIndex (size_t idx, const CompilerType& desired_type)
{
std::pair<uint64_t, bool> value(_indexAtPositionForInlinePayload(idx));
if (!value.second)
@@ -325,7 +325,7 @@ protected:
uint32_t m_ptr_size;
ClangASTContext* m_ast_ctx;
- ClangASTType m_uint_star_type;
+ CompilerType m_uint_star_type;
};
namespace lldb_private {
Modified: lldb/trunk/source/DataFormatters/TypeFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeFormat.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/TypeFormat.cpp (original)
+++ lldb/trunk/source/DataFormatters/TypeFormat.cpp Tue Aug 11 17:53:00 2015
@@ -23,7 +23,7 @@
#include "lldb/DataFormatters/FormatManager.h"
#include "lldb/DataFormatters/TypeFormat.h"
#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/TypeList.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
@@ -91,7 +91,7 @@ TypeFormatImpl_Format::FormatObject (Val
}
else
{
- ClangASTType clang_type = value.GetClangType ();
+ CompilerType clang_type = value.GetClangType ();
if (clang_type)
{
// put custom bytes to display in the DataExtractor to override the default value logic
@@ -134,7 +134,7 @@ TypeFormatImpl_Format::FormatObject (Val
// for a formatting error (or else we wouldn't be able to reformat
// until a next update), an empty string is treated as a "false"
// return from here, but that's about as severe as we get
- // ClangASTType::DumpTypeValue() should always return
+ // CompilerType::DumpTypeValue() should always return
// something, even if that something is an error message
if (sstr.GetString().empty())
dest.clear();
@@ -192,7 +192,7 @@ TypeFormatImpl_EnumType::FormatObject (V
return false;
auto iter = m_types.find(valobj_key),
end = m_types.end();
- ClangASTType valobj_enum_type;
+ CompilerType valobj_enum_type;
if (iter == end)
{
// probably a redundant check
Modified: lldb/trunk/source/DataFormatters/TypeSummary.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeSummary.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/TypeSummary.cpp (original)
+++ lldb/trunk/source/DataFormatters/TypeSummary.cpp Tue Aug 11 17:53:00 2015
@@ -23,7 +23,7 @@
#include "lldb/DataFormatters/TypeSummary.h"
#include "lldb/DataFormatters/ValueObjectPrinter.h"
#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
Modified: lldb/trunk/source/DataFormatters/TypeSynthetic.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeSynthetic.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/TypeSynthetic.cpp (original)
+++ lldb/trunk/source/DataFormatters/TypeSynthetic.cpp Tue Aug 11 17:53:00 2015
@@ -22,7 +22,7 @@
#include "lldb/DataFormatters/TypeSynthetic.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Interpreter/ScriptInterpreter.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
@@ -136,7 +136,7 @@ lldb::ValueObjectSP
SyntheticChildrenFrontEnd::CreateValueObjectFromAddress (const char* name,
uint64_t address,
const ExecutionContext& exe_ctx,
- ClangASTType type)
+ CompilerType type)
{
ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromAddress(name, address, exe_ctx, type));
if (valobj_sp)
@@ -148,7 +148,7 @@ lldb::ValueObjectSP
SyntheticChildrenFrontEnd::CreateValueObjectFromData (const char* name,
const DataExtractor& data,
const ExecutionContext& exe_ctx,
- ClangASTType type)
+ CompilerType type)
{
ValueObjectSP valobj_sp(ValueObject::CreateValueObjectFromData(name, data, exe_ctx, type));
if (valobj_sp)
Modified: lldb/trunk/source/DataFormatters/VectorType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/VectorType.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/VectorType.cpp (original)
+++ lldb/trunk/source/DataFormatters/VectorType.cpp Tue Aug 11 17:53:00 2015
@@ -12,7 +12,7 @@
#include "lldb/Core/ValueObject.h"
#include "lldb/DataFormatters/CXXFormatterFunctions.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Utility/LLDBAssert.h"
@@ -20,9 +20,9 @@ using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::formatters;
-static ClangASTType
+static CompilerType
GetClangTypeForFormat (lldb::Format format,
- ClangASTType element_type,
+ CompilerType element_type,
ClangASTContext *ast_ctx)
{
lldbassert(ast_ctx && "ast_ctx needs to be not NULL");
@@ -119,7 +119,7 @@ GetClangTypeForFormat (lldb::Format form
static lldb::Format
GetItemFormatForFormat (lldb::Format format,
- ClangASTType element_type)
+ CompilerType element_type)
{
switch (format)
{
@@ -169,8 +169,8 @@ GetItemFormatForFormat (lldb::Format for
}
static size_t
-CalculateNumChildren (ClangASTType container_type,
- ClangASTType element_type,
+CalculateNumChildren (CompilerType container_type,
+ CompilerType element_type,
lldb_private::ExecutionContextScope *exe_scope = nullptr // does not matter here because all we trade in are basic types
)
{
@@ -229,8 +229,8 @@ namespace lldb_private {
Update()
{
m_parent_format = m_backend.GetFormat();
- ClangASTType parent_type(m_backend.GetClangType());
- ClangASTType element_type;
+ CompilerType parent_type(m_backend.GetClangType());
+ CompilerType element_type;
parent_type.IsVectorType(&element_type, nullptr);
m_child_type = ::GetClangTypeForFormat(m_parent_format, element_type, parent_type.GetTypeSystem()->AsClangASTContext());
m_num_children = ::CalculateNumChildren(parent_type,
@@ -262,7 +262,7 @@ namespace lldb_private {
private:
lldb::Format m_parent_format;
lldb::Format m_item_format;
- ClangASTType m_child_type;
+ CompilerType m_child_type;
size_t m_num_children;
};
}
Modified: lldb/trunk/source/Expression/ASTDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ASTDumper.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ASTDumper.cpp (original)
+++ lldb/trunk/source/Expression/ASTDumper.cpp Tue Aug 11 17:53:00 2015
@@ -10,7 +10,7 @@
#include "lldb/Core/Log.h"
#include "lldb/Expression/ASTDumper.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "llvm/Support/raw_ostream.h"
@@ -80,7 +80,7 @@ ASTDumper::ASTDumper (lldb::clang_type_t
m_dump = clang::QualType::getFromOpaquePtr(type).getAsString();
}
-ASTDumper::ASTDumper (const ClangASTType &clang_type)
+ASTDumper::ASTDumper (const CompilerType &clang_type)
{
m_dump = ClangASTContext::GetQualType(clang_type).getAsString();
}
Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Tue Aug 11 17:53:00 2015
@@ -272,7 +272,7 @@ ClangASTSource::CompleteType (TagDecl *t
if (!type)
continue;
- ClangASTType clang_type (type->GetClangFullType());
+ CompilerType clang_type (type->GetClangFullType());
if (!clang_type)
continue;
@@ -311,7 +311,7 @@ ClangASTSource::CompleteType (TagDecl *t
if (!type)
continue;
- ClangASTType clang_type (type->GetClangFullType());
+ CompilerType clang_type (type->GetClangFullType());
if (!clang_type)
continue;
@@ -761,9 +761,9 @@ ClangASTSource::FindExternalVisibleDecls
(name_string ? name_string : "<anonymous>"));
}
- ClangASTType full_type = type_sp->GetClangFullType();
+ CompilerType full_type = type_sp->GetClangFullType();
- ClangASTType copied_clang_type (GuardedCopyType(full_type));
+ CompilerType copied_clang_type (GuardedCopyType(full_type));
if (!copied_clang_type)
{
@@ -1876,14 +1876,14 @@ ClangASTSource::AddNamespace (NameSearch
return dyn_cast<NamespaceDecl>(copied_decl);
}
-ClangASTType
-ClangASTSource::GuardedCopyType (const ClangASTType &src_type)
+CompilerType
+ClangASTSource::GuardedCopyType (const CompilerType &src_type)
{
ClangASTMetrics::RegisterLLDBImport();
ClangASTContext* src_ast = src_type.GetTypeSystem()->AsClangASTContext();
if (!src_ast)
- return ClangASTType();
+ return CompilerType();
SetImportInProgress(true);
@@ -1894,13 +1894,13 @@ ClangASTSource::GuardedCopyType (const C
if (copied_qual_type.getAsOpaquePtr() && copied_qual_type->getCanonicalTypeInternal().isNull())
// this shouldn't happen, but we're hardening because the AST importer seems to be generating bad types
// on occasion.
- return ClangASTType();
+ return CompilerType();
- return ClangASTType(m_ast_context, copied_qual_type);
+ return CompilerType(m_ast_context, copied_qual_type);
}
clang::NamedDecl *
-NameSearchContext::AddVarDecl(const ClangASTType &type)
+NameSearchContext::AddVarDecl(const CompilerType &type)
{
assert (type && "Type for variable must be valid!");
@@ -1929,7 +1929,7 @@ NameSearchContext::AddVarDecl(const Clan
}
clang::NamedDecl *
-NameSearchContext::AddFunDecl (const ClangASTType &type, bool extern_c)
+NameSearchContext::AddFunDecl (const CompilerType &type, bool extern_c)
{
assert (type && "Type for variable must be valid!");
@@ -2030,11 +2030,11 @@ NameSearchContext::AddGenericFunDecl()
ArrayRef<QualType>(), // argument types
proto_info));
- return AddFunDecl(ClangASTType (m_ast_source.m_ast_context, generic_function_type), true);
+ return AddFunDecl(CompilerType (m_ast_source.m_ast_context, generic_function_type), true);
}
clang::NamedDecl *
-NameSearchContext::AddTypeDecl(const ClangASTType &clang_type)
+NameSearchContext::AddTypeDecl(const CompilerType &clang_type)
{
if (clang_type)
{
Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Tue Aug 11 17:53:00 2015
@@ -1103,7 +1103,7 @@ ClangExpressionDeclMap::FindExternalVisi
if (!this_type)
return;
- ClangASTType pointee_type = this_type->GetClangForwardType().GetPointeeType();
+ CompilerType pointee_type = this_type->GetClangForwardType().GetPointeeType();
if (pointee_type.IsValid())
{
@@ -1220,7 +1220,7 @@ ClangExpressionDeclMap::FindExternalVisi
if (!self_type)
return;
- ClangASTType self_clang_type = self_type->GetClangFullType();
+ CompilerType self_clang_type = self_type->GetClangFullType();
if (ClangASTContext::IsObjCClassType(self_clang_type))
{
@@ -1632,7 +1632,7 @@ ClangExpressionDeclMap::GetVariableValue
return false;
}
- ClangASTType var_clang_type = var_type->GetClangFullType();
+ CompilerType var_clang_type = var_type->GetClangFullType();
if (!var_clang_type)
{
@@ -1673,7 +1673,7 @@ ClangExpressionDeclMap::GetVariableValue
}
}
- ClangASTType type_to_use = GuardedCopyType(var_clang_type);
+ CompilerType type_to_use = GuardedCopyType(var_clang_type);
if (!type_to_use)
{
@@ -1930,7 +1930,7 @@ ClangExpressionDeclMap::AddOneRegister (
{
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
- ClangASTType clang_type = ClangASTContext::GetBuiltinTypeForEncodingAndBitSize (m_ast_context,
+ CompilerType clang_type = ClangASTContext::GetBuiltinTypeForEncodingAndBitSize (m_ast_context,
reg_info->encoding,
reg_info->byte_size * 8);
@@ -1980,7 +1980,7 @@ ClangExpressionDeclMap::AddOneFunction (
NamedDecl *function_decl = NULL;
Address fun_address;
- ClangASTType function_clang_type;
+ CompilerType function_clang_type;
bool is_indirect_function = false;
@@ -2006,7 +2006,7 @@ ClangExpressionDeclMap::AddOneFunction (
fun_address = function->GetAddressRange().GetBaseAddress();
- ClangASTType copied_function_type = GuardedCopyType(function_clang_type);
+ CompilerType copied_function_type = GuardedCopyType(function_clang_type);
if (copied_function_type)
{
function_decl = context.AddFunDecl(copied_function_type);
@@ -2105,7 +2105,7 @@ TypeFromParser
ClangExpressionDeclMap::CopyClassType(TypeFromUser &ut,
unsigned int current_id)
{
- ClangASTType copied_clang_type = GuardedCopyType(ut);
+ CompilerType copied_clang_type = GuardedCopyType(ut);
if (!copied_clang_type)
{
@@ -2119,10 +2119,10 @@ ClangExpressionDeclMap::CopyClassType(Ty
if (copied_clang_type.IsAggregateType() && copied_clang_type.GetCompleteType ())
{
- ClangASTType void_clang_type = ClangASTContext::GetBasicType(m_ast_context, eBasicTypeVoid);
- ClangASTType void_ptr_clang_type = void_clang_type.GetPointerType();
+ CompilerType void_clang_type = ClangASTContext::GetBasicType(m_ast_context, eBasicTypeVoid);
+ CompilerType void_ptr_clang_type = void_clang_type.GetPointerType();
- ClangASTType method_type = ClangASTContext::CreateFunctionType (m_ast_context,
+ CompilerType method_type = ClangASTContext::CreateFunctionType (m_ast_context,
void_clang_type,
&void_ptr_clang_type,
1,
@@ -2157,7 +2157,7 @@ ClangExpressionDeclMap::AddOneType(NameS
TypeFromUser &ut,
unsigned int current_id)
{
- ClangASTType copied_clang_type = GuardedCopyType(ut);
+ CompilerType copied_clang_type = GuardedCopyType(ut);
if (!copied_clang_type)
{
Modified: lldb/trunk/source/Expression/ClangExpressionVariable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionVariable.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionVariable.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionVariable.cpp Tue Aug 11 17:53:00 2015
@@ -80,14 +80,14 @@ ClangExpressionVariable::SetRegisterInfo
return m_frozen_sp->GetValue().SetContext (Value::eContextTypeRegisterInfo, const_cast<RegisterInfo *>(reg_info));
}
-ClangASTType
+CompilerType
ClangExpressionVariable::GetClangType()
{
return m_frozen_sp->GetClangType();
}
void
-ClangExpressionVariable::SetClangType(const ClangASTType &clang_type)
+ClangExpressionVariable::SetClangType(const CompilerType &clang_type)
{
m_frozen_sp->GetValue().SetClangType(clang_type);
}
Modified: lldb/trunk/source/Expression/ClangFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangFunction.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangFunction.cpp (original)
+++ lldb/trunk/source/Expression/ClangFunction.cpp Tue Aug 11 17:53:00 2015
@@ -52,7 +52,7 @@ using namespace lldb_private;
ClangFunction::ClangFunction
(
ExecutionContextScope &exe_scope,
- const ClangASTType &return_type,
+ const CompilerType &return_type,
const Address& functionAddress,
const ValueList &arg_value_list,
const char *name
@@ -151,7 +151,7 @@ ClangFunction::CompileFunction (Stream &
uint32_t num_args = UINT32_MAX;
bool trust_function = false;
// GetArgumentCount returns -1 for an unprototyped function.
- ClangASTType function_clang_type;
+ CompilerType function_clang_type;
if (m_function_ptr)
{
function_clang_type = m_function_ptr->GetClangType();
@@ -181,7 +181,7 @@ ClangFunction::CompileFunction (Stream &
}
else
{
- ClangASTType clang_qual_type = m_arg_values.GetValueAtIndex(i)->GetClangType ();
+ CompilerType clang_qual_type = m_arg_values.GetValueAtIndex(i)->GetClangType ();
if (clang_qual_type)
{
type_name = clang_qual_type.GetTypeName().AsCString("");
@@ -449,7 +449,7 @@ ClangFunction::GetThreadPlanToCallFuncti
lldb::ThreadPlanSP new_plan_sp (new ThreadPlanCallFunction (*thread,
wrapper_address,
- ClangASTType(),
+ CompilerType(),
args,
options));
new_plan_sp->SetIsMasterPlan(true);
@@ -462,7 +462,7 @@ ClangFunction::FetchFunctionResults (Exe
{
// Read the return value - it is the last field in the struct:
// FIXME: How does clang tell us there's no return value? We need to handle that case.
- // FIXME: Create our ThreadPlanCallFunction with the return ClangASTType, and then use GetReturnValueObject
+ // FIXME: Create our ThreadPlanCallFunction with the return CompilerType, and then use GetReturnValueObject
// to fetch the value. That way we can fetch any values we need.
Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Tue Aug 11 17:53:00 2015
@@ -305,7 +305,7 @@ ClangUserExpression::ScanContext(Executi
return;
}
- ClangASTType self_clang_type = self_type->GetClangForwardType();
+ CompilerType self_clang_type = self_type->GetClangForwardType();
if (!self_clang_type)
{
Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Tue Aug 11 17:53:00 2015
@@ -34,7 +34,7 @@
#include "lldb/Expression/IRInterpreter.h"
#include "lldb/Host/Endian.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/CPPLanguageRuntime.h"
#include <map>
@@ -1509,7 +1509,7 @@ IRForTarget::MaybeHandleVariable (Value
if (value_decl == NULL)
return false;
- lldb_private::ClangASTType clang_type(&value_decl->getASTContext(), value_decl->getType());
+ lldb_private::CompilerType clang_type(&value_decl->getASTContext(), value_decl->getType());
const Type *value_type = NULL;
Modified: lldb/trunk/source/Expression/Materializer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/Materializer.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Expression/Materializer.cpp (original)
+++ lldb/trunk/source/Expression/Materializer.cpp Tue Aug 11 17:53:00 2015
@@ -48,7 +48,7 @@ Materializer::AddStructMember (Entity &e
}
void
-Materializer::Entity::SetSizeAndAlignmentFromType (ClangASTType &type)
+Materializer::Entity::SetSizeAndAlignmentFromType (CompilerType &type)
{
m_size = type.GetByteSize(nullptr);
Modified: lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp Tue Aug 11 17:53:00 2015
@@ -333,7 +333,7 @@ ABIMacOSX_arm::GetArgumentValues (Thread
if (!value)
return false;
- ClangASTType clang_type = value->GetClangType();
+ CompilerType clang_type = value->GetClangType();
if (clang_type)
{
bool is_signed = false;
@@ -416,7 +416,7 @@ ABIMacOSX_arm::GetArgumentValues (Thread
ValueObjectSP
ABIMacOSX_arm::GetReturnValueObjectImpl (Thread &thread,
- lldb_private::ClangASTType &clang_type) const
+ lldb_private::CompilerType &clang_type) const
{
Value value;
ValueObjectSP return_valobj_sp;
@@ -511,7 +511,7 @@ ABIMacOSX_arm::SetReturnValueObject(lldb
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
Modified: lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@ public:
protected:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
virtual bool
Modified: lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp Tue Aug 11 17:53:00 2015
@@ -322,7 +322,7 @@ ABIMacOSX_arm64::GetArgumentValues (Thre
if (!value)
return false;
- ClangASTType value_type = value->GetClangType();
+ CompilerType value_type = value->GetClangType();
if (value_type)
{
bool is_signed = false;
@@ -424,7 +424,7 @@ ABIMacOSX_arm64::SetReturnValueObject(ll
return error;
}
- ClangASTType return_value_type = new_value_sp->GetClangType();
+ CompilerType return_value_type = new_value_sp->GetClangType();
if (!return_value_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -709,7 +709,7 @@ ABIMacOSX_arm64::RegisterIsVolatile (con
static bool
LoadValueFromConsecutiveGPRRegisters (ExecutionContext &exe_ctx,
RegisterContext *reg_ctx,
- const ClangASTType &value_type,
+ const CompilerType &value_type,
bool is_return_value, // false => parameter, true => return value
uint32_t &NGRN, // NGRN (see ABI documentation)
uint32_t &NSRN, // NSRN (see ABI documentation)
@@ -724,7 +724,7 @@ LoadValueFromConsecutiveGPRRegisters (Ex
const ByteOrder byte_order = exe_ctx.GetProcessRef().GetByteOrder();
Error error;
- ClangASTType base_type;
+ CompilerType base_type;
const uint32_t homogeneous_count = value_type.IsHomogeneousAggregate (&base_type);
if (homogeneous_count > 0 && homogeneous_count <= 8)
{
@@ -861,7 +861,7 @@ LoadValueFromConsecutiveGPRRegisters (Ex
}
ValueObjectSP
-ABIMacOSX_arm64::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABIMacOSX_arm64::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
Modified: lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h Tue Aug 11 17:53:00 2015
@@ -118,7 +118,7 @@ public:
protected:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
private:
ABIMacOSX_arm64() :
Modified: lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp Tue Aug 11 17:53:00 2015
@@ -418,7 +418,7 @@ ABIMacOSX_i386::PrepareNormalCall (Threa
break;
case Value::eValueTypeHostAddress:
{
- ClangASTType clang_type (val->GetClangType());
+ CompilerType clang_type (val->GetClangType());
if (clang_type)
{
uint32_t cstr_length = 0;
@@ -545,7 +545,7 @@ ABIMacOSX_i386::GetArgumentValues (Threa
// We currently only support extracting values with Clang QualTypes.
// Do we care about others?
- ClangASTType clang_type (value->GetClangType());
+ CompilerType clang_type (value->GetClangType());
if (clang_type)
{
bool is_signed;
@@ -582,7 +582,7 @@ ABIMacOSX_i386::SetReturnValueObject(lld
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -654,7 +654,7 @@ ABIMacOSX_i386::SetReturnValueObject(lld
ValueObjectSP
ABIMacOSX_i386::GetReturnValueObjectImpl (Thread &thread,
- ClangASTType &clang_type) const
+ CompilerType &clang_type) const
{
Value value;
ValueObjectSP return_valobj_sp;
Modified: lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h Tue Aug 11 17:53:00 2015
@@ -52,7 +52,7 @@ public:
protected:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
Modified: lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp Tue Aug 11 17:53:00 2015
@@ -333,7 +333,7 @@ ABISysV_arm::GetArgumentValues (Thread &
if (!value)
return false;
- ClangASTType clang_type = value->GetClangType();
+ CompilerType clang_type = value->GetClangType();
if (clang_type)
{
bool is_signed = false;
@@ -417,7 +417,7 @@ GetReturnValuePassedInMemory(Thread &thr
ValueObjectSP
ABISysV_arm::GetReturnValueObjectImpl (Thread &thread,
- lldb_private::ClangASTType &clang_type) const
+ lldb_private::CompilerType &clang_type) const
{
Value value;
ValueObjectSP return_valobj_sp;
@@ -579,7 +579,7 @@ ABISysV_arm::SetReturnValueObject(lldb::
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
Modified: lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-arm/ABISysV_arm.h Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const override;
+ lldb_private::CompilerType &ast_type) const override;
public:
bool
Modified: lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp Tue Aug 11 17:53:00 2015
@@ -313,7 +313,7 @@ ABISysV_arm64::GetArgumentValues (Thread
if (!value)
return false;
- ClangASTType value_type = value->GetClangType();
+ CompilerType value_type = value->GetClangType();
if (value_type)
{
bool is_signed = false;
@@ -397,7 +397,7 @@ ABISysV_arm64::SetReturnValueObject(lldb
return error;
}
- ClangASTType return_value_type = new_value_sp->GetClangType();
+ CompilerType return_value_type = new_value_sp->GetClangType();
if (!return_value_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -686,7 +686,7 @@ ABISysV_arm64::RegisterIsVolatile (const
static bool
LoadValueFromConsecutiveGPRRegisters (ExecutionContext &exe_ctx,
RegisterContext *reg_ctx,
- const ClangASTType &value_type,
+ const CompilerType &value_type,
bool is_return_value, // false => parameter, true => return value
uint32_t &NGRN, // NGRN (see ABI documentation)
uint32_t &NSRN, // NSRN (see ABI documentation)
@@ -701,7 +701,7 @@ LoadValueFromConsecutiveGPRRegisters (Ex
const ByteOrder byte_order = exe_ctx.GetProcessRef().GetByteOrder();
Error error;
- ClangASTType base_type;
+ CompilerType base_type;
const uint32_t homogeneous_count = value_type.IsHomogeneousAggregate (&base_type);
if (homogeneous_count > 0 && homogeneous_count <= 8)
{
@@ -831,7 +831,7 @@ LoadValueFromConsecutiveGPRRegisters (Ex
}
ValueObjectSP
-ABISysV_arm64::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_arm64::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
Modified: lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const override;
+ lldb_private::CompilerType &ast_type) const override;
public:
bool
Modified: lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp Tue Aug 11 17:53:00 2015
@@ -359,14 +359,14 @@ ABISysV_hexagon::SetReturnValueObject (
}
ValueObjectSP
-ABISysV_hexagon::GetReturnValueObjectSimple ( Thread &thread, ClangASTType &return_clang_type ) const
+ABISysV_hexagon::GetReturnValueObjectSimple ( Thread &thread, CompilerType &return_clang_type ) const
{
ValueObjectSP return_valobj_sp;
return return_valobj_sp;
}
ValueObjectSP
-ABISysV_hexagon::GetReturnValueObjectImpl ( Thread &thread, ClangASTType &return_clang_type ) const
+ABISysV_hexagon::GetReturnValueObjectImpl ( Thread &thread, CompilerType &return_clang_type ) const
{
ValueObjectSP return_valobj_sp;
return return_valobj_sp;
Modified: lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h Tue Aug 11 17:53:00 2015
@@ -56,12 +56,12 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple ( lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type ) const;
+ lldb_private::CompilerType &ast_type ) const;
public:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl ( lldb_private::Thread &thread,
- lldb_private::ClangASTType &type ) const;
+ lldb_private::CompilerType &type ) const;
// specialized to work with llvm IR types
virtual lldb::ValueObjectSP
Modified: lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp Tue Aug 11 17:53:00 2015
@@ -387,7 +387,7 @@ ABISysV_i386::GetArgumentValues (Thread
return false;
// Currently: Support for extracting values with Clang QualTypes only.
- ClangASTType clang_type (value->GetClangType());
+ CompilerType clang_type (value->GetClangType());
if (clang_type)
{
bool is_signed;
@@ -426,7 +426,7 @@ ABISysV_i386::SetReturnValueObject(lldb:
ValueObjectSP
ABISysV_i386::GetReturnValueObjectSimple (Thread &thread,
- ClangASTType &return_clang_type) const
+ CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
@@ -686,7 +686,7 @@ ABISysV_i386::GetReturnValueObjectSimple
ValueObjectSP
-ABISysV_i386::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_i386::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Modified: lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-i386/ABISysV_i386.h Tue Aug 11 17:53:00 2015
@@ -49,7 +49,7 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
bool
RegisterIsCalleeSaved (const lldb_private::RegisterInfo *reg_info);
@@ -57,7 +57,7 @@ protected:
public:
lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &type) const override;
+ lldb_private::CompilerType &type) const override;
bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan) override;
Modified: lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp Tue Aug 11 17:53:00 2015
@@ -325,7 +325,7 @@ ABISysV_mips::SetReturnValueObject(lldb:
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -398,14 +398,14 @@ ABISysV_mips::SetReturnValueObject(lldb:
ValueObjectSP
-ABISysV_mips::GetReturnValueObjectSimple (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_mips::GetReturnValueObjectSimple (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
return return_valobj_sp;
}
ValueObjectSP
-ABISysV_mips::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_mips::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
Modified: lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-mips/ABISysV_mips.h Tue Aug 11 17:53:00 2015
@@ -46,12 +46,12 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &type) const;
+ lldb_private::CompilerType &type) const;
virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
Modified: lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp Tue Aug 11 17:53:00 2015
@@ -290,7 +290,7 @@ ABISysV_mips64::SetReturnValueObject(lld
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -368,14 +368,14 @@ ABISysV_mips64::SetReturnValueObject(lld
ValueObjectSP
-ABISysV_mips64::GetReturnValueObjectSimple (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_mips64::GetReturnValueObjectSimple (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
return return_valobj_sp;
}
ValueObjectSP
-ABISysV_mips64::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_mips64::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
Modified: lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h Tue Aug 11 17:53:00 2015
@@ -46,12 +46,12 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &type) const;
+ lldb_private::CompilerType &type) const;
virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
Modified: lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp Tue Aug 11 17:53:00 2015
@@ -436,7 +436,7 @@ ABISysV_ppc::GetArgumentValues (Thread &
// We currently only support extracting values with Clang QualTypes.
// Do we care about others?
- ClangASTType clang_type = value->GetClangType();
+ CompilerType clang_type = value->GetClangType();
if (!clang_type)
return false;
bool is_signed;
@@ -476,7 +476,7 @@ ABISysV_ppc::SetReturnValueObject(lldb::
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -563,7 +563,7 @@ ABISysV_ppc::SetReturnValueObject(lldb::
ValueObjectSP
ABISysV_ppc::GetReturnValueObjectSimple (Thread &thread,
- ClangASTType &return_clang_type) const
+ CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
@@ -724,7 +724,7 @@ ABISysV_ppc::GetReturnValueObjectSimple
}
ValueObjectSP
-ABISysV_ppc::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_ppc::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
@@ -781,7 +781,7 @@ ABISysV_ppc::GetReturnValueObjectImpl (T
bool is_complex;
uint32_t count;
- ClangASTType field_clang_type = return_clang_type.GetFieldAtIndex (idx, name, &field_bit_offset, NULL, NULL);
+ CompilerType field_clang_type = return_clang_type.GetFieldAtIndex (idx, name, &field_bit_offset, NULL, NULL);
const size_t field_bit_width = field_clang_type.GetBitSize(&thread);
// If there are any unaligned fields, this is stored in memory.
@@ -858,7 +858,7 @@ ABISysV_ppc::GetReturnValueObjectImpl (T
else
{
uint64_t next_field_bit_offset = 0;
- ClangASTType next_field_clang_type = return_clang_type.GetFieldAtIndex (idx + 1,
+ CompilerType next_field_clang_type = return_clang_type.GetFieldAtIndex (idx + 1,
name,
&next_field_bit_offset,
NULL,
@@ -882,7 +882,7 @@ ABISysV_ppc::GetReturnValueObjectImpl (T
else
{
uint64_t prev_field_bit_offset = 0;
- ClangASTType prev_field_clang_type = return_clang_type.GetFieldAtIndex (idx - 1,
+ CompilerType prev_field_clang_type = return_clang_type.GetFieldAtIndex (idx - 1,
name,
&prev_field_bit_offset,
NULL,
Modified: lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h Tue Aug 11 17:53:00 2015
@@ -46,12 +46,12 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &type) const;
+ lldb_private::CompilerType &type) const;
virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
Modified: lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp Tue Aug 11 17:53:00 2015
@@ -436,7 +436,7 @@ ABISysV_ppc64::GetArgumentValues (Thread
// We currently only support extracting values with Clang QualTypes.
// Do we care about others?
- ClangASTType clang_type = value->GetClangType();
+ CompilerType clang_type = value->GetClangType();
if (!clang_type)
return false;
bool is_signed;
@@ -476,7 +476,7 @@ ABISysV_ppc64::SetReturnValueObject(lldb
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -563,7 +563,7 @@ ABISysV_ppc64::SetReturnValueObject(lldb
ValueObjectSP
ABISysV_ppc64::GetReturnValueObjectSimple (Thread &thread,
- ClangASTType &return_clang_type) const
+ CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
@@ -724,7 +724,7 @@ ABISysV_ppc64::GetReturnValueObjectSimpl
}
ValueObjectSP
-ABISysV_ppc64::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_ppc64::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
@@ -781,7 +781,7 @@ ABISysV_ppc64::GetReturnValueObjectImpl
bool is_complex;
uint32_t count;
- ClangASTType field_clang_type = return_clang_type.GetFieldAtIndex (idx, name, &field_bit_offset, NULL, NULL);
+ CompilerType field_clang_type = return_clang_type.GetFieldAtIndex (idx, name, &field_bit_offset, NULL, NULL);
const size_t field_bit_width = field_clang_type.GetBitSize(&thread);
// If there are any unaligned fields, this is stored in memory.
@@ -858,7 +858,7 @@ ABISysV_ppc64::GetReturnValueObjectImpl
else
{
uint64_t next_field_bit_offset = 0;
- ClangASTType next_field_clang_type = return_clang_type.GetFieldAtIndex (idx + 1,
+ CompilerType next_field_clang_type = return_clang_type.GetFieldAtIndex (idx + 1,
name,
&next_field_bit_offset,
NULL,
@@ -882,7 +882,7 @@ ABISysV_ppc64::GetReturnValueObjectImpl
else
{
uint64_t prev_field_bit_offset = 0;
- ClangASTType prev_field_clang_type = return_clang_type.GetFieldAtIndex (idx - 1,
+ CompilerType prev_field_clang_type = return_clang_type.GetFieldAtIndex (idx - 1,
name,
&prev_field_bit_offset,
NULL,
Modified: lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h Tue Aug 11 17:53:00 2015
@@ -46,12 +46,12 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &type) const;
+ lldb_private::CompilerType &type) const;
virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
Modified: lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp Tue Aug 11 17:53:00 2015
@@ -502,7 +502,7 @@ ABISysV_x86_64::GetArgumentValues (Threa
// We currently only support extracting values with Clang QualTypes.
// Do we care about others?
- ClangASTType clang_type = value->GetClangType();
+ CompilerType clang_type = value->GetClangType();
if (!clang_type)
return false;
bool is_signed;
@@ -542,7 +542,7 @@ ABISysV_x86_64::SetReturnValueObject(lld
return error;
}
- ClangASTType clang_type = new_value_sp->GetClangType();
+ CompilerType clang_type = new_value_sp->GetClangType();
if (!clang_type)
{
error.SetErrorString ("Null clang type for return value.");
@@ -633,7 +633,7 @@ ABISysV_x86_64::SetReturnValueObject(lld
ValueObjectSP
ABISysV_x86_64::GetReturnValueObjectSimple (Thread &thread,
- ClangASTType &return_clang_type) const
+ CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
Value value;
@@ -839,7 +839,7 @@ ABISysV_x86_64::GetReturnValueObjectSimp
}
ValueObjectSP
-ABISysV_x86_64::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_clang_type) const
+ABISysV_x86_64::GetReturnValueObjectImpl (Thread &thread, CompilerType &return_clang_type) const
{
ValueObjectSP return_valobj_sp;
@@ -902,7 +902,7 @@ ABISysV_x86_64::GetReturnValueObjectImpl
bool is_complex;
uint32_t count;
- ClangASTType field_clang_type = return_clang_type.GetFieldAtIndex (idx, name, &field_bit_offset, NULL, NULL);
+ CompilerType field_clang_type = return_clang_type.GetFieldAtIndex (idx, name, &field_bit_offset, NULL, NULL);
const size_t field_bit_width = field_clang_type.GetBitSize(&thread);
// if we don't know the size of the field (e.g. invalid type), just bail out
@@ -989,7 +989,7 @@ ABISysV_x86_64::GetReturnValueObjectImpl
else
{
uint64_t next_field_bit_offset = 0;
- ClangASTType next_field_clang_type = return_clang_type.GetFieldAtIndex (idx + 1,
+ CompilerType next_field_clang_type = return_clang_type.GetFieldAtIndex (idx + 1,
name,
&next_field_bit_offset,
NULL,
@@ -1013,7 +1013,7 @@ ABISysV_x86_64::GetReturnValueObjectImpl
else
{
uint64_t prev_field_bit_offset = 0;
- ClangASTType prev_field_clang_type = return_clang_type.GetFieldAtIndex (idx - 1,
+ CompilerType prev_field_clang_type = return_clang_type.GetFieldAtIndex (idx - 1,
name,
&prev_field_bit_offset,
NULL,
Modified: lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h (original)
+++ lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h Tue Aug 11 17:53:00 2015
@@ -46,12 +46,12 @@ public:
protected:
lldb::ValueObjectSP
GetReturnValueObjectSimple (lldb_private::Thread &thread,
- lldb_private::ClangASTType &ast_type) const;
+ lldb_private::CompilerType &ast_type) const;
public:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
- lldb_private::ClangASTType &type) const;
+ lldb_private::CompilerType &type) const;
virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Tue Aug 11 17:53:00 2015
@@ -627,8 +627,8 @@ DynamicLoaderMacOSXDYLD::NotifyBreakpoin
ValueList argument_values;
Value input_value;
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
- ClangASTType clang_uint32_type = clang_ast_context->GetBuiltinTypeForEncodingAndBitSize(lldb::eEncodingUint, 32);
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_uint32_type = clang_ast_context->GetBuiltinTypeForEncodingAndBitSize(lldb::eEncodingUint, 32);
input_value.SetValueType (Value::eValueTypeScalar);
input_value.SetClangType (clang_uint32_type);
// input_value.SetContext (Value::eContextTypeClangType, clang_uint32_type);
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp Tue Aug 11 17:53:00 2015
@@ -529,7 +529,7 @@ ClassDescriptorV2::iVarsStorage::fill (A
[this,process,encoding_to_type_sp](const char * name, const char * type, lldb::addr_t offset_ptr, uint64_t size) -> bool {
const bool for_expression = false;
const bool stop_loop = false;
- ClangASTType ivar_type = encoding_to_type_sp->RealizeType(type, for_expression);
+ CompilerType ivar_type = encoding_to_type_sp->RealizeType(type, for_expression);
if (ivar_type)
{
Scalar offset_scalar;
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp Tue Aug 11 17:53:00 2015
@@ -496,7 +496,7 @@ AppleObjCDeclVendor::FinishDecl(clang::O
if (log)
log->Printf("[ AOTV::FD] Instance variable [%s] [%s], offset at %" PRIx64, name, type, offset_ptr);
- ClangASTType ivar_type = m_runtime.GetEncodingToType()->RealizeType(m_ast_ctx, type, for_expression);
+ CompilerType ivar_type = m_runtime.GetEncodingToType()->RealizeType(m_ast_ctx, type, for_expression);
if (ivar_type.IsValid())
{
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp Tue Aug 11 17:53:00 2015
@@ -51,7 +51,7 @@ AppleObjCRuntime::AppleObjCRuntime(Proce
bool
AppleObjCRuntime::GetObjectDescription (Stream &str, ValueObject &valobj)
{
- ClangASTType clang_type(valobj.GetClangType());
+ CompilerType clang_type(valobj.GetClangType());
bool is_signed;
// ObjC objects can only be pointers (or numbers that actually represents pointers
// but haven't been typecast, because reasons..)
@@ -89,7 +89,7 @@ AppleObjCRuntime::GetObjectDescription (
return false;
Target *target = exe_ctx.GetTargetPtr();
- ClangASTType clang_type = value.GetClangType();
+ CompilerType clang_type = value.GetClangType();
if (clang_type)
{
if (!ClangASTContext::IsObjCObjectPointerType(clang_type))
@@ -102,7 +102,7 @@ AppleObjCRuntime::GetObjectDescription (
{
// If it is not a pointer, see if we can make it into a pointer.
ClangASTContext *ast_context = target->GetScratchClangASTContext();
- ClangASTType opaque_type = ast_context->GetBasicType(eBasicTypeObjCID);
+ CompilerType opaque_type = ast_context->GetBasicType(eBasicTypeObjCID);
if (!opaque_type)
opaque_type = ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
//value.SetContext(Value::eContextTypeClangType, opaque_type_ptr);
@@ -115,7 +115,7 @@ AppleObjCRuntime::GetObjectDescription (
// This is the return value:
ClangASTContext *ast_context = target->GetScratchClangASTContext();
- ClangASTType return_clang_type = ast_context->GetCStringType(true);
+ CompilerType return_clang_type = ast_context->GetCStringType(true);
Value ret;
// ret.SetContext(Value::eContextTypeClangType, return_clang_type);
ret.SetClangType (return_clang_type);
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Tue Aug 11 17:53:00 2015
@@ -13,7 +13,7 @@
#include "lldb/lldb-enumerations.h"
#include "lldb/Core/ClangForward.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Core/ClangForward.h"
#include "lldb/Core/ConstString.h"
@@ -411,13 +411,13 @@ AppleObjCRuntimeV2::GetDynamicTypeAndAdd
}
else
{
- // try to go for a ClangASTType at least
+ // try to go for a CompilerType at least
DeclVendor* vendor = GetDeclVendor();
if (vendor)
{
std::vector<clang::NamedDecl*> decls;
if (vendor->FindDecls(class_name, false, 1, decls) && decls.size())
- class_type_or_name.SetClangASTType(ClangASTContext::GetTypeForDecl(decls[0]));
+ class_type_or_name.SetCompilerType(ClangASTContext::GetTypeForDecl(decls[0]));
}
}
}
@@ -784,7 +784,7 @@ AppleObjCRuntimeV2::CreateObjectChecker(
}
size_t
-AppleObjCRuntimeV2::GetByteOffsetForIvar (ClangASTType &parent_ast_type, const char *ivar_name)
+AppleObjCRuntimeV2::GetByteOffsetForIvar (CompilerType &parent_ast_type, const char *ivar_name)
{
uint32_t ivar_offset = LLDB_INVALID_IVAR_OFFSET;
@@ -1245,8 +1245,8 @@ AppleObjCRuntimeV2::UpdateISAToDescripto
}
// Make some types for our arguments
- ClangASTType clang_uint32_t_type = ast->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 32);
- ClangASTType clang_void_pointer_type = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_uint32_t_type = ast->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 32);
+ CompilerType clang_void_pointer_type = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
if (!m_get_class_info_code.get())
{
@@ -1499,8 +1499,8 @@ AppleObjCRuntimeV2::UpdateISAToDescripto
}
// Make some types for our arguments
- ClangASTType clang_uint32_t_type = ast->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 32);
- ClangASTType clang_void_pointer_type = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_uint32_t_type = ast->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 32);
+ CompilerType clang_void_pointer_type = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
if (!m_get_shared_cache_class_info_code.get())
{
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h Tue Aug 11 17:53:00 2015
@@ -74,7 +74,7 @@ public:
}
virtual size_t
- GetByteOffsetForIvar (ClangASTType &parent_qual_type, const char *ivar_name);
+ GetByteOffsetForIvar (CompilerType &parent_qual_type, const char *ivar_name);
virtual void
UpdateISAToDescriptorMapIfNeeded();
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp Tue Aug 11 17:53:00 2015
@@ -522,7 +522,7 @@ AppleObjCTrampolineHandler::AppleObjCVTa
ClangASTContext *clang_ast_context = process->GetTarget().GetScratchClangASTContext();
ValueList argument_values;
Value input_value;
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
input_value.SetValueType (Value::eValueTypeScalar);
//input_value.SetContext (Value::eContextTypeClangType, clang_void_ptr_type);
@@ -795,7 +795,7 @@ AppleObjCTrampolineHandler::SetupDispatc
if (!m_impl_function.get())
{
ClangASTContext *clang_ast_context = thread.GetProcess()->GetTarget().GetScratchClangASTContext();
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
m_impl_function.reset(new ClangFunction (thread,
clang_void_ptr_type,
impl_code_address,
@@ -898,7 +898,7 @@ AppleObjCTrampolineHandler::GetStepThrou
ClangASTContext *clang_ast_context = target_sp->GetScratchClangASTContext();
ValueList argument_values;
Value void_ptr_value;
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
void_ptr_value.SetValueType (Value::eValueTypeScalar);
//void_ptr_value.SetContext (Value::eContextTypeClangType, clang_void_ptr_type);
void_ptr_value.SetClangType (clang_void_ptr_type);
@@ -1080,7 +1080,7 @@ AppleObjCTrampolineHandler::GetStepThrou
dispatch_values.PushValue (*(argument_values.GetValueAtIndex(sel_index)));
Value flag_value;
- ClangASTType clang_int_type = clang_ast_context->GetBuiltinTypeForEncodingAndBitSize(lldb::eEncodingSint, 32);
+ CompilerType clang_int_type = clang_ast_context->GetBuiltinTypeForEncodingAndBitSize(lldb::eEncodingSint, 32);
flag_value.SetValueType (Value::eValueTypeScalar);
//flag_value.SetContext (Value::eContextTypeClangType, clang_int_type);
flag_value.SetClangType (clang_int_type);
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp Tue Aug 11 17:53:00 2015
@@ -10,7 +10,7 @@
#include "AppleObjCTypeEncodingParser.h"
#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/Process.h"
#include "lldb/Target/Target.h"
#include "lldb/Utility/StringLexer.h"
@@ -136,7 +136,7 @@ AppleObjCTypeEncodingParser::BuildAggreg
ClangASTContext *lldb_ctx = ClangASTContext::GetASTContext(&ast_ctx);
if (!lldb_ctx)
return clang::QualType();
- ClangASTType union_type(lldb_ctx->CreateRecordType(nullptr, lldb::eAccessPublic, name.c_str(), kind, lldb::eLanguageTypeC));
+ CompilerType union_type(lldb_ctx->CreateRecordType(nullptr, lldb::eAccessPublic, name.c_str(), kind, lldb::eLanguageTypeC));
if (union_type)
{
ClangASTContext::StartTagDeclarationDefinition(union_type);
@@ -150,7 +150,7 @@ AppleObjCTypeEncodingParser::BuildAggreg
elem_name.Printf("__unnamed_%u",count);
element.name = std::string(elem_name.GetData());
}
- ClangASTContext::AddFieldToRecordType(union_type, element.name.c_str(), ClangASTType(&ast_ctx, element.type), lldb::eAccessPublic, element.bitfield);
+ ClangASTContext::AddFieldToRecordType(union_type, element.name.c_str(), CompilerType(&ast_ctx, element.type), lldb::eAccessPublic, element.bitfield);
++count;
}
ClangASTContext::CompleteTagDeclarationDefinition(union_type);
@@ -170,7 +170,7 @@ AppleObjCTypeEncodingParser::BuildArray
ClangASTContext *lldb_ctx = ClangASTContext::GetASTContext(&ast_ctx);
if (!lldb_ctx)
return clang::QualType();
- ClangASTType array_type(lldb_ctx->CreateArrayType(ClangASTType(&ast_ctx, element_type), size, false));
+ CompilerType array_type(lldb_ctx->CreateArrayType(CompilerType(&ast_ctx, element_type), size, false));
return ClangASTContext::GetQualType(array_type);
}
@@ -384,15 +384,15 @@ AppleObjCTypeEncodingParser::BuildType (
}
}
-ClangASTType
+CompilerType
AppleObjCTypeEncodingParser::RealizeType (clang::ASTContext &ast_ctx, const char* name, bool for_expression)
{
if (name && name[0])
{
StringLexer lexer(name);
clang::QualType qual_type = BuildType(ast_ctx, lexer, for_expression);
- return ClangASTType(&ast_ctx, qual_type);
+ return CompilerType(&ast_ctx, qual_type);
}
- return ClangASTType();
+ return CompilerType();
}
Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.h Tue Aug 11 17:53:00 2015
@@ -31,7 +31,7 @@ namespace lldb_private {
{
public:
AppleObjCTypeEncodingParser (ObjCLanguageRuntime& runtime);
- virtual ClangASTType RealizeType (clang::ASTContext &ast_ctx, const char* name, bool for_expression);
+ virtual CompilerType RealizeType (clang::ASTContext &ast_ctx, const char* name, bool for_expression);
virtual ~AppleObjCTypeEncodingParser() {}
private:
Modified: lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp Tue Aug 11 17:53:00 2015
@@ -93,7 +93,7 @@ lldb_private::InferiorCallMmap (Process
if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, mmap_range))
{
ClangASTContext *clang_ast_context = process->GetTarget().GetScratchClangASTContext();
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
lldb::addr_t args[] = { addr, length, prot_arg, flags_arg, fd, offset };
lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread,
mmap_range.GetBaseAddress(),
@@ -182,7 +182,7 @@ lldb_private::InferiorCallMunmap (Proces
lldb::addr_t args[] = { addr, length };
lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread,
munmap_range.GetBaseAddress(),
- ClangASTType(),
+ CompilerType(),
args,
options));
if (call_plan_sp)
@@ -235,7 +235,7 @@ lldb_private::InferiorCall (Process *pro
options.SetTimeoutUsec(500000);
ClangASTContext *clang_ast_context = process->GetTarget().GetScratchClangASTContext();
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread,
*address,
clang_void_ptr_type,
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Tue Aug 11 17:53:00 2015
@@ -553,11 +553,11 @@ SymbolFileDWARF::GetTypes (SymbolContext
// });
// }
- std::set<ClangASTType> clang_type_set;
+ std::set<CompilerType> clang_type_set;
size_t num_types_added = 0;
for (Type *type : type_set)
{
- ClangASTType clang_type = type->GetClangForwardType();
+ CompilerType clang_type = type->GetClangForwardType();
if (clang_type_set.find(clang_type) == clang_type_set.end())
{
clang_type_set.insert(clang_type);
@@ -1221,7 +1221,7 @@ SymbolFileDWARF::ParseCompileUnitFunctio
bool is_static = false;
bool is_variadic = false;
unsigned type_quals = 0;
- std::vector<ClangASTType> param_types;
+ std::vector<CompilerType> param_types;
std::vector<clang::ParmVarDecl*> param_decls;
const DWARFDebugInfoEntry *decl_ctx_die = NULL;
DWARFDeclContext decl_ctx;
@@ -1648,7 +1648,7 @@ SymbolFileDWARF::ParseTemplateDIE (DWARF
attributes);
const char *name = NULL;
Type *lldb_type = NULL;
- ClangASTType clang_type;
+ CompilerType clang_type;
uint64_t uval64 = 0;
bool uval64_valid = false;
if (num_attributes > 0)
@@ -1788,9 +1788,9 @@ class SymbolFileDWARF::DelayedAddObjCCla
public:
DelayedAddObjCClassProperty
(
- const ClangASTType &class_opaque_type,
+ const CompilerType &class_opaque_type,
const char *property_name,
- const ClangASTType &property_opaque_type, // The property type is only required if you don't have an ivar decl
+ const CompilerType &property_opaque_type, // The property type is only required if you don't have an ivar decl
clang::ObjCIvarDecl *ivar_decl,
const char *property_setter_name,
const char *property_getter_name,
@@ -1850,9 +1850,9 @@ public:
m_metadata_ap.get());
}
private:
- ClangASTType m_class_opaque_type;
+ CompilerType m_class_opaque_type;
const char *m_property_name;
- ClangASTType m_property_opaque_type;
+ CompilerType m_property_opaque_type;
clang::ObjCIvarDecl *m_ivar_decl;
const char *m_property_setter_name;
const char *m_property_getter_name;
@@ -1921,7 +1921,7 @@ SymbolFileDWARF::ParseChildMembers
const SymbolContext& sc,
DWARFCompileUnit* dwarf_cu,
const DWARFDebugInfoEntry *parent_die,
- ClangASTType &class_clang_type,
+ CompilerType &class_clang_type,
const LanguageType class_language,
std::vector<clang::CXXBaseSpecifier *>& base_classes,
std::vector<int>& member_accessibilities,
@@ -2268,14 +2268,14 @@ SymbolFileDWARF::ParseChildMembers
last_field_info.Clear();
}
- ClangASTType member_clang_type = member_type->GetClangLayoutType();
+ CompilerType member_clang_type = member_type->GetClangLayoutType();
{
// Older versions of clang emit array[0] and array[1] in the same way (<rdar://problem/12566646>).
// If the current field is at the end of the structure, then there is definitely no room for extra
// elements and we override the type to array[0].
- ClangASTType member_array_element_type;
+ CompilerType member_array_element_type;
uint64_t member_array_size;
bool member_array_is_incomplete;
@@ -2454,7 +2454,7 @@ SymbolFileDWARF::ParseChildMembers
break;
}
- ClangASTType base_class_clang_type = base_class_type->GetClangFullType();
+ CompilerType base_class_clang_type = base_class_type->GetClangFullType();
assert (base_class_clang_type);
if (class_language == eLanguageTypeObjC)
{
@@ -2599,19 +2599,19 @@ SymbolFileDWARF::ResolveTypeUID (DWARFCo
// SymbolFileDWARF objects to detect if this DWARF file is the one that
// can resolve a clang_type.
bool
-SymbolFileDWARF::HasForwardDeclForClangType (const ClangASTType &clang_type)
+SymbolFileDWARF::HasForwardDeclForClangType (const CompilerType &clang_type)
{
- ClangASTType clang_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(clang_type);
+ CompilerType clang_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(clang_type);
const DWARFDebugInfoEntry* die = m_forward_decl_clang_type_to_die.lookup (clang_type_no_qualifiers.GetOpaqueQualType());
return die != NULL;
}
bool
-SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
+SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (CompilerType &clang_type)
{
// We have a struct/union/class/enum that needs to be fully resolved.
- ClangASTType clang_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(clang_type);
+ CompilerType clang_type_no_qualifiers = ClangASTContext::RemoveFastQualifiers(clang_type);
const DWARFDebugInfoEntry* die = m_forward_decl_clang_type_to_die.lookup (clang_type_no_qualifiers.GetOpaqueQualType());
if (die == NULL)
{
@@ -2810,7 +2810,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeD
clang::TypeSourceInfo *type_source_info = base_class->getTypeSourceInfo();
if (type_source_info)
{
- ClangASTType base_class_type (GetClangASTContext().getASTContext(), type_source_info->getType());
+ CompilerType base_class_type (GetClangASTContext().getASTContext(), type_source_info->getType());
if (base_class_type.GetCompleteType() == false)
{
if (!base_class_error)
@@ -4566,7 +4566,7 @@ SymbolFileDWARF::ParseChildParameters (c
bool skip_artificial,
bool &is_static,
bool &is_variadic,
- std::vector<ClangASTType>& function_param_types,
+ std::vector<CompilerType>& function_param_types,
std::vector<clang::ParmVarDecl*>& function_param_decls,
unsigned &type_quals) // ,
// ClangASTContext::TemplateParameterInfos &template_param_infos))
@@ -4740,7 +4740,7 @@ size_t
SymbolFileDWARF::ParseChildEnumerators
(
const SymbolContext& sc,
- lldb_private::ClangASTType &clang_type,
+ lldb_private::CompilerType &clang_type,
bool is_signed,
uint32_t enumerator_byte_size,
DWARFCompileUnit* dwarf_cu,
@@ -5941,7 +5941,7 @@ SymbolFileDWARF::ParseType (const Symbol
Declaration decl;
Type::EncodingDataType encoding_data_type = Type::eEncodingIsUID;
- ClangASTType clang_type;
+ CompilerType clang_type;
DWARFFormValue form_value;
dw_attr_t attr;
@@ -6590,7 +6590,7 @@ SymbolFileDWARF::ParseType (const Symbol
DEBUG_PRINTF ("0x%8.8" PRIx64 ": %s (\"%s\")\n", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr);
- ClangASTType enumerator_clang_type;
+ CompilerType enumerator_clang_type;
clang_type.SetClangType (&ast, m_forward_decl_die_to_clang_type.lookup (die));
if (!clang_type)
{
@@ -6759,7 +6759,7 @@ SymbolFileDWARF::ParseType (const Symbol
DEBUG_PRINTF ("0x%8.8" PRIx64 ": %s (\"%s\")\n", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr);
- ClangASTType return_clang_type;
+ CompilerType return_clang_type;
Type *func_type = NULL;
if (type_die_offset != DW_INVALID_OFFSET)
@@ -6771,7 +6771,7 @@ SymbolFileDWARF::ParseType (const Symbol
return_clang_type = ast.GetBasicType(eBasicTypeVoid);
- std::vector<ClangASTType> function_param_types;
+ std::vector<CompilerType> function_param_types;
std::vector<clang::ParmVarDecl*> function_param_decls;
// Parse the function children for the parameters
@@ -6818,7 +6818,7 @@ SymbolFileDWARF::ParseType (const Symbol
ObjCLanguageRuntime::MethodName objc_method (type_name_cstr, true);
if (objc_method.IsValid(true))
{
- ClangASTType class_opaque_type;
+ CompilerType class_opaque_type;
ConstString class_name(objc_method.GetClassName());
if (class_name)
{
@@ -6826,7 +6826,7 @@ SymbolFileDWARF::ParseType (const Symbol
if (complete_objc_class_type_sp)
{
- ClangASTType type_clang_forward_type = complete_objc_class_type_sp->GetClangForwardType();
+ CompilerType type_clang_forward_type = complete_objc_class_type_sp->GetClangForwardType();
if (ClangASTContext::IsObjCObjectOrInterfaceType(type_clang_forward_type))
class_opaque_type = type_clang_forward_type;
}
@@ -6962,7 +6962,7 @@ SymbolFileDWARF::ParseType (const Symbol
}
else
{
- ClangASTType class_opaque_type = class_type->GetClangForwardType();
+ CompilerType class_opaque_type = class_type->GetClangForwardType();
if (ClangASTContext::IsCXXClassType(class_opaque_type))
{
if (class_opaque_type.IsBeingDefined ())
@@ -7183,7 +7183,7 @@ SymbolFileDWARF::ParseType (const Symbol
ParseChildArrayInfo(sc, dwarf_cu, die, first_index, element_orders, byte_stride, bit_stride);
if (byte_stride == 0 && bit_stride == 0)
byte_stride = element_type->GetByteSize();
- ClangASTType array_element_type = element_type->GetClangForwardType();
+ CompilerType array_element_type = element_type->GetClangForwardType();
uint64_t array_element_bit_stride = byte_stride * 8 + bit_stride;
if (element_orders.size() > 0)
{
@@ -7250,8 +7250,8 @@ SymbolFileDWARF::ParseType (const Symbol
Type *pointee_type = ResolveTypeUID(type_die_offset);
Type *class_type = ResolveTypeUID(containing_type_die_offset);
- ClangASTType pointee_clang_type = pointee_type->GetClangForwardType();
- ClangASTType class_clang_type = class_type->GetClangLayoutType();
+ CompilerType pointee_clang_type = pointee_type->GetClangForwardType();
+ CompilerType class_clang_type = class_type->GetClangLayoutType();
clang_type = ClangASTContext::CreateMemberPointerType(pointee_clang_type, class_clang_type);
@@ -8087,7 +8087,7 @@ void
SymbolFileDWARF::CompleteTagDecl (void *baton, clang::TagDecl *decl)
{
SymbolFileDWARF *symbol_file_dwarf = (SymbolFileDWARF *)baton;
- ClangASTType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
+ CompilerType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
if (clang_type)
symbol_file_dwarf->ResolveClangOpaqueTypeDefinition (clang_type);
}
@@ -8096,7 +8096,7 @@ void
SymbolFileDWARF::CompleteObjCInterfaceDecl (void *baton, clang::ObjCInterfaceDecl *decl)
{
SymbolFileDWARF *symbol_file_dwarf = (SymbolFileDWARF *)baton;
- ClangASTType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
+ CompilerType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
if (clang_type)
symbol_file_dwarf->ResolveClangOpaqueTypeDefinition (clang_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=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Tue Aug 11 17:53:00 2015
@@ -112,7 +112,7 @@ public:
virtual size_t ParseVariablesForContext (const lldb_private::SymbolContext& sc);
virtual lldb_private::Type* ResolveTypeUID(lldb::user_id_t type_uid);
- virtual bool ResolveClangOpaqueTypeDefinition (lldb_private::ClangASTType& clang_type);
+ virtual bool ResolveClangOpaqueTypeDefinition (lldb_private::CompilerType& clang_type);
virtual lldb_private::Type* ResolveType (DWARFCompileUnit* dwarf_cu, const DWARFDebugInfoEntry* type_die, bool assert_not_being_parsed = true);
virtual clang::DeclContext* GetClangDeclContextContainingTypeUID (lldb::user_id_t type_uid);
@@ -273,7 +273,7 @@ public:
}
bool
- HasForwardDeclForClangType (const lldb_private::ClangASTType &clang_type);
+ HasForwardDeclForClangType (const lldb_private::CompilerType &clang_type);
protected:
@@ -345,7 +345,7 @@ protected:
const lldb_private::SymbolContext& sc,
DWARFCompileUnit* dwarf_cu,
const DWARFDebugInfoEntry *die,
- lldb_private::ClangASTType &class_clang_type,
+ lldb_private::CompilerType &class_clang_type,
const lldb::LanguageType class_language,
std::vector<clang::CXXBaseSpecifier *>& base_classes,
std::vector<int>& member_accessibilities,
@@ -363,7 +363,7 @@ protected:
bool skip_artificial,
bool &is_static,
bool &is_variadic,
- std::vector<lldb_private::ClangASTType>& function_args,
+ std::vector<lldb_private::CompilerType>& function_args,
std::vector<clang::ParmVarDecl*>& function_param_decls,
unsigned &type_quals);
// lldb_private::ClangASTContext::TemplateParameterInfos &template_param_infos); // not currently needed
@@ -371,7 +371,7 @@ protected:
size_t ParseChildEnumerators(
const lldb_private::SymbolContext& sc,
- lldb_private::ClangASTType &clang_type,
+ lldb_private::CompilerType &clang_type,
bool is_signed,
uint32_t enumerator_byte_size,
DWARFCompileUnit* dwarf_cu,
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp Tue Aug 11 17:53:00 2015
@@ -788,7 +788,7 @@ SymbolFileDWARFDebugMap::ResolveTypeUID(
}
bool
-SymbolFileDWARFDebugMap::ResolveClangOpaqueTypeDefinition (ClangASTType& clang_type)
+SymbolFileDWARFDebugMap::ResolveClangOpaqueTypeDefinition (CompilerType& clang_type)
{
// We have a struct/union/class/enum that needs to be fully resolved.
return false;
@@ -1433,7 +1433,7 @@ void
SymbolFileDWARFDebugMap::CompleteTagDecl (void *baton, clang::TagDecl *decl)
{
SymbolFileDWARFDebugMap *symbol_file_dwarf = (SymbolFileDWARFDebugMap *)baton;
- ClangASTType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
+ CompilerType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
if (clang_type)
{
symbol_file_dwarf->ForEachSymbolFile([&](SymbolFileDWARF *oso_dwarf) -> bool {
@@ -1451,7 +1451,7 @@ void
SymbolFileDWARFDebugMap::CompleteObjCInterfaceDecl (void *baton, clang::ObjCInterfaceDecl *decl)
{
SymbolFileDWARFDebugMap *symbol_file_dwarf = (SymbolFileDWARFDebugMap *)baton;
- ClangASTType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
+ CompilerType clang_type = symbol_file_dwarf->GetClangASTContext().GetTypeForDecl (decl);
if (clang_type)
{
symbol_file_dwarf->ForEachSymbolFile([&](SymbolFileDWARF *oso_dwarf) -> bool {
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h Tue Aug 11 17:53:00 2015
@@ -78,7 +78,7 @@ public:
lldb_private::Type* ResolveTypeUID (lldb::user_id_t type_uid) override;
clang::DeclContext* GetClangDeclContextContainingTypeUID (lldb::user_id_t type_uid) override;
clang::DeclContext* GetClangDeclContextForTypeUID (const lldb_private::SymbolContext &sc, lldb::user_id_t type_uid) override;
- bool ResolveClangOpaqueTypeDefinition (lldb_private::ClangASTType& clang_type) override;
+ bool ResolveClangOpaqueTypeDefinition (lldb_private::CompilerType& clang_type) override;
uint32_t ResolveSymbolContext (const lldb_private::Address& so_addr, uint32_t resolve_scope, lldb_private::SymbolContext& sc) override;
uint32_t ResolveSymbolContext (const lldb_private::FileSpec& file_spec, uint32_t line, bool check_inlines, uint32_t resolve_scope, lldb_private::SymbolContextList& sc_list) override;
uint32_t FindGlobalVariables (const lldb_private::ConstString &name, const lldb_private::ClangNamespaceDecl *namespace_decl, bool append, uint32_t max_matches, lldb_private::VariableList& variables) override;
Modified: lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp Tue Aug 11 17:53:00 2015
@@ -300,7 +300,7 @@ SymbolFileSymtab::ResolveTypeUID(lldb::u
}
bool
-SymbolFileSymtab::ResolveClangOpaqueTypeDefinition (lldb_private::ClangASTType& clang_opaque_type)
+SymbolFileSymtab::ResolveClangOpaqueTypeDefinition (lldb_private::CompilerType& clang_opaque_type)
{
return false;
}
Modified: lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h Tue Aug 11 17:53:00 2015
@@ -82,7 +82,7 @@ public:
ResolveTypeUID(lldb::user_id_t type_uid);
virtual bool
- ResolveClangOpaqueTypeDefinition (lldb_private::ClangASTType& clang_type);
+ ResolveClangOpaqueTypeDefinition (lldb_private::CompilerType& clang_type);
virtual uint32_t
ResolveSymbolContext (const lldb_private::Address& so_addr, uint32_t resolve_scope, lldb_private::SymbolContext& sc);
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp Tue Aug 11 17:53:00 2015
@@ -212,7 +212,7 @@ AppleGetItemInfoHandler::SetupGetItemInf
if (!m_get_item_info_function.get())
{
ClangASTContext *clang_ast_context = thread.GetProcess()->GetTarget().GetScratchClangASTContext();
- ClangASTType get_item_info_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType get_item_info_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
m_get_item_info_function.reset(new ClangFunction (thread,
get_item_info_return_type,
impl_code_address,
@@ -295,17 +295,17 @@ AppleGetItemInfoHandler::GetItemInfo (Th
// Where the return_buffer argument points to a 24 byte region of memory already allocated by lldb in
// the inferior process.
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
Value return_buffer_ptr_value;
return_buffer_ptr_value.SetValueType (Value::eValueTypeScalar);
return_buffer_ptr_value.SetClangType (clang_void_ptr_type);
- ClangASTType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
+ CompilerType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
Value debug_value;
debug_value.SetValueType (Value::eValueTypeScalar);
debug_value.SetClangType (clang_int_type);
- ClangASTType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
+ CompilerType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
Value item_value;
item_value.SetValueType (Value::eValueTypeScalar);
item_value.SetClangType (clang_uint64_type);
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.h Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/Core/Error.h"
#include "lldb/Expression/ClangFunction.h"
#include "lldb/Host/Mutex.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
// This class will insert a ClangUtilityFunction into the inferior process for
// calling libBacktraceRecording's __introspection_dispatch_queue_item_get_info()
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp Tue Aug 11 17:53:00 2015
@@ -216,7 +216,7 @@ AppleGetPendingItemsHandler::SetupGetPen
if (!m_get_pending_items_function.get())
{
ClangASTContext *clang_ast_context = thread.GetProcess()->GetTarget().GetScratchClangASTContext();
- ClangASTType get_pending_items_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType get_pending_items_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
m_get_pending_items_function.reset(new ClangFunction (thread,
get_pending_items_return_type,
impl_code_address,
@@ -301,17 +301,17 @@ AppleGetPendingItemsHandler::GetPendingI
// Where the return_buffer argument points to a 24 byte region of memory already allocated by lldb in
// the inferior process.
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
Value return_buffer_ptr_value;
return_buffer_ptr_value.SetValueType (Value::eValueTypeScalar);
return_buffer_ptr_value.SetClangType (clang_void_ptr_type);
- ClangASTType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
+ CompilerType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
Value debug_value;
debug_value.SetValueType (Value::eValueTypeScalar);
debug_value.SetClangType (clang_int_type);
- ClangASTType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
+ CompilerType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
Value queue_value;
queue_value.SetValueType (Value::eValueTypeScalar);
queue_value.SetClangType (clang_uint64_type);
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.h Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/Core/Error.h"
#include "lldb/Expression/ClangFunction.h"
#include "lldb/Host/Mutex.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
// This class will insert a ClangUtilityFunction into the inferior process for
// calling libBacktraceRecording's __introspection_dispatch_queue_get_pending_items()
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp Tue Aug 11 17:53:00 2015
@@ -125,7 +125,7 @@ AppleGetQueuesHandler::Detach ()
}
}
-// Construct a ClangASTType for the structure that g_get_current_queues_function_code will return by value
+// Construct a CompilerType for the structure that g_get_current_queues_function_code will return by value
// so we can extract the fields after performing the function call.
// i.e. we are getting this struct returned to us:
//
@@ -224,7 +224,7 @@ AppleGetQueuesHandler::SetupGetQueuesFun
if (!m_get_queues_function.get())
{
ClangASTContext *clang_ast_context = thread.GetProcess()->GetTarget().GetScratchClangASTContext();
- ClangASTType get_queues_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType get_queues_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
m_get_queues_function.reset(new ClangFunction (thread,
get_queues_return_type,
impl_code_address,
@@ -308,12 +308,12 @@ AppleGetQueuesHandler::GetCurrentQueues
// Where the return_buffer argument points to a 24 byte region of memory already allocated by lldb in
// the inferior process.
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
Value return_buffer_ptr_value;
return_buffer_ptr_value.SetValueType (Value::eValueTypeScalar);
return_buffer_ptr_value.SetClangType (clang_void_ptr_type);
- ClangASTType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
+ CompilerType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
Value debug_value;
debug_value.SetValueType (Value::eValueTypeScalar);
debug_value.SetClangType (clang_int_type);
@@ -322,7 +322,7 @@ AppleGetQueuesHandler::GetCurrentQueues
page_to_free_value.SetValueType (Value::eValueTypeScalar);
page_to_free_value.SetClangType (clang_void_ptr_type);
- ClangASTType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
+ CompilerType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
Value page_to_free_size_value;
page_to_free_size_value.SetValueType (Value::eValueTypeScalar);
page_to_free_size_value.SetClangType (clang_uint64_type);
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.h Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/Core/Error.h"
#include "lldb/Expression/ClangFunction.h"
#include "lldb/Host/Mutex.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
// This class will insert a ClangUtilityFunction into the inferior process for
// calling libBacktraceRecording's introspection_get_dispatch_queues()
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp Tue Aug 11 17:53:00 2015
@@ -216,7 +216,7 @@ AppleGetThreadItemInfoHandler::SetupGetT
if (!m_get_thread_item_info_function.get())
{
ClangASTContext *clang_ast_context = thread.GetProcess()->GetTarget().GetScratchClangASTContext();
- ClangASTType get_thread_item_info_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType get_thread_item_info_return_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
m_get_thread_item_info_function.reset(new ClangFunction (thread,
get_thread_item_info_return_type,
impl_code_address,
@@ -298,17 +298,17 @@ AppleGetThreadItemInfoHandler::GetThread
// Where the return_buffer argument points to a 24 byte region of memory already allocated by lldb in
// the inferior process.
- ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+ CompilerType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
Value return_buffer_ptr_value;
return_buffer_ptr_value.SetValueType (Value::eValueTypeScalar);
return_buffer_ptr_value.SetClangType (clang_void_ptr_type);
- ClangASTType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
+ CompilerType clang_int_type = clang_ast_context->GetBasicType(eBasicTypeInt);
Value debug_value;
debug_value.SetValueType (Value::eValueTypeScalar);
debug_value.SetClangType (clang_int_type);
- ClangASTType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
+ CompilerType clang_uint64_type = clang_ast_context->GetBasicType(eBasicTypeUnsignedLongLong);
Value thread_id_value;
thread_id_value.SetValueType (Value::eValueTypeScalar);
thread_id_value.SetClangType (clang_uint64_type);
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.h Tue Aug 11 17:53:00 2015
@@ -20,7 +20,7 @@
#include "lldb/Core/Error.h"
#include "lldb/Expression/ClangFunction.h"
#include "lldb/Host/Mutex.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
// This class will insert a ClangUtilityFunction into the inferior process for
// calling libBacktraceRecording's __introspection_dispatch_thread_get_item_info()
Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp (original)
+++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp Tue Aug 11 17:53:00 2015
@@ -446,8 +446,8 @@ SystemRuntimeMacOSX::ReadLibdispatchTSDI
ClangASTContext *ast_ctx = m_process->GetTarget().GetScratchClangASTContext();
if (ast_ctx->getASTContext() && m_dispatch_tsd_indexes_addr != LLDB_INVALID_ADDRESS)
{
- ClangASTType uint16 = ast_ctx->GetIntTypeFromBitSize(16, false);
- ClangASTType dispatch_tsd_indexes_s = ast_ctx->CreateRecordType(nullptr, lldb::eAccessPublic, "__lldb_dispatch_tsd_indexes_s", clang::TTK_Struct, lldb::eLanguageTypeC);
+ CompilerType uint16 = ast_ctx->GetIntTypeFromBitSize(16, false);
+ CompilerType dispatch_tsd_indexes_s = ast_ctx->CreateRecordType(nullptr, lldb::eAccessPublic, "__lldb_dispatch_tsd_indexes_s", clang::TTK_Struct, lldb::eLanguageTypeC);
ClangASTContext::StartTagDeclarationDefinition(dispatch_tsd_indexes_s);
ClangASTContext::AddFieldToRecordType (dispatch_tsd_indexes_s, "dti_version", uint16, lldb::eAccessPublic, 0);
Modified: lldb/trunk/source/Symbol/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CMakeLists.txt?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/CMakeLists.txt (original)
+++ lldb/trunk/source/Symbol/CMakeLists.txt Tue Aug 11 17:53:00 2015
@@ -4,10 +4,10 @@ add_lldb_library(lldbSymbol
Block.cpp
ClangASTContext.cpp
ClangASTImporter.cpp
- ClangASTType.cpp
ClangExternalASTSourceCallbacks.cpp
ClangExternalASTSourceCommon.cpp
ClangNamespaceDecl.cpp
+ CompilerType.cpp
CompileUnit.cpp
CompactUnwindInfo.cpp
Declaration.cpp
Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Tue Aug 11 17:53:00 2015
@@ -579,71 +579,71 @@ QualTypeMatchesBitSize(const uint64_t bi
return true;
return false;
}
-ClangASTType
+CompilerType
ClangASTContext::GetBuiltinTypeForEncodingAndBitSize (Encoding encoding, uint32_t bit_size)
{
return ClangASTContext::GetBuiltinTypeForEncodingAndBitSize (getASTContext(), encoding, bit_size);
}
-ClangASTType
+CompilerType
ClangASTContext::GetBuiltinTypeForEncodingAndBitSize (ASTContext *ast, Encoding encoding, uint32_t bit_size)
{
if (!ast)
- return ClangASTType();
+ return CompilerType();
switch (encoding)
{
case eEncodingInvalid:
if (QualTypeMatchesBitSize (bit_size, ast, ast->VoidPtrTy))
- return ClangASTType (ast, ast->VoidPtrTy);
+ return CompilerType (ast, ast->VoidPtrTy);
break;
case eEncodingUint:
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedCharTy))
- return ClangASTType (ast, ast->UnsignedCharTy);
+ return CompilerType (ast, ast->UnsignedCharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedShortTy))
- return ClangASTType (ast, ast->UnsignedShortTy);
+ return CompilerType (ast, ast->UnsignedShortTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedIntTy))
- return ClangASTType (ast, ast->UnsignedIntTy);
+ return CompilerType (ast, ast->UnsignedIntTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedLongTy))
- return ClangASTType (ast, ast->UnsignedLongTy);
+ return CompilerType (ast, ast->UnsignedLongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedLongLongTy))
- return ClangASTType (ast, ast->UnsignedLongLongTy);
+ return CompilerType (ast, ast->UnsignedLongLongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedInt128Ty))
- return ClangASTType (ast, ast->UnsignedInt128Ty);
+ return CompilerType (ast, ast->UnsignedInt128Ty);
break;
case eEncodingSint:
if (QualTypeMatchesBitSize (bit_size, ast, ast->CharTy))
- return ClangASTType (ast, ast->CharTy);
+ return CompilerType (ast, ast->CharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->ShortTy))
- return ClangASTType (ast, ast->ShortTy);
+ return CompilerType (ast, ast->ShortTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->IntTy))
- return ClangASTType (ast, ast->IntTy);
+ return CompilerType (ast, ast->IntTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->LongTy))
- return ClangASTType (ast, ast->LongTy);
+ return CompilerType (ast, ast->LongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->LongLongTy))
- return ClangASTType (ast, ast->LongLongTy);
+ return CompilerType (ast, ast->LongLongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->Int128Ty))
- return ClangASTType (ast, ast->Int128Ty);
+ return CompilerType (ast, ast->Int128Ty);
break;
case eEncodingIEEE754:
if (QualTypeMatchesBitSize (bit_size, ast, ast->FloatTy))
- return ClangASTType (ast, ast->FloatTy);
+ return CompilerType (ast, ast->FloatTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->DoubleTy))
- return ClangASTType (ast, ast->DoubleTy);
+ return CompilerType (ast, ast->DoubleTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->LongDoubleTy))
- return ClangASTType (ast, ast->LongDoubleTy);
+ return CompilerType (ast, ast->LongDoubleTy);
break;
case eEncodingVector:
// Sanity check that bit_size is a multiple of 8's.
if (bit_size && !(bit_size & 0x7u))
- return ClangASTType (ast, ast->getExtVectorType (ast->UnsignedCharTy, bit_size/8));
+ return CompilerType (ast, ast->getExtVectorType (ast->UnsignedCharTy, bit_size/8));
break;
}
- return ClangASTType();
+ return CompilerType();
}
@@ -711,7 +711,7 @@ ClangASTContext::GetBasicTypeEnumeration
return eBasicTypeInvalid;
}
-ClangASTType
+CompilerType
ClangASTContext::GetBasicType (ASTContext *ast, const ConstString &name)
{
if (ast)
@@ -719,7 +719,7 @@ ClangASTContext::GetBasicType (ASTContex
lldb::BasicType basic_type = ClangASTContext::GetBasicTypeEnumeration (name);
return ClangASTContext::GetBasicType (ast, basic_type);
}
- return ClangASTType();
+ return CompilerType();
}
uint32_t
@@ -730,13 +730,13 @@ ClangASTContext::GetPointerByteSize ()
return m_pointer_byte_size;
}
-ClangASTType
+CompilerType
ClangASTContext::GetBasicType (lldb::BasicType basic_type)
{
return GetBasicType (getASTContext(), basic_type);
}
-ClangASTType
+CompilerType
ClangASTContext::GetBasicType (ASTContext *ast, lldb::BasicType basic_type)
{
if (ast)
@@ -844,13 +844,13 @@ ClangASTContext::GetBasicType (ASTContex
}
if (clang_type)
- return ClangASTType (GetASTContext(ast), clang_type);
+ return CompilerType (GetASTContext(ast), clang_type);
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetBuiltinTypeForDWARFEncodingAndBitSize (const char *type_name, uint32_t dw_ate, uint32_t bit_size)
{
ASTContext *ast = getASTContext();
@@ -866,18 +866,18 @@ ClangASTContext::GetBuiltinTypeForDWARFE
case DW_ATE_address:
if (QualTypeMatchesBitSize (bit_size, ast, ast->VoidPtrTy))
- return ClangASTType (ast, ast->VoidPtrTy);
+ return CompilerType (ast, ast->VoidPtrTy);
break;
case DW_ATE_boolean:
if (QualTypeMatchesBitSize (bit_size, ast, ast->BoolTy))
- return ClangASTType (ast, ast->BoolTy);
+ return CompilerType (ast, ast->BoolTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedCharTy))
- return ClangASTType (ast, ast->UnsignedCharTy);
+ return CompilerType (ast, ast->UnsignedCharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedShortTy))
- return ClangASTType (ast, ast->UnsignedShortTy);
+ return CompilerType (ast, ast->UnsignedShortTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedIntTy))
- return ClangASTType (ast, ast->UnsignedIntTy);
+ return CompilerType (ast, ast->UnsignedIntTy);
break;
case DW_ATE_lo_user:
@@ -886,40 +886,40 @@ ClangASTContext::GetBuiltinTypeForDWARFE
{
if (::strstr(type_name, "complex"))
{
- ClangASTType complex_int_clang_type = GetBuiltinTypeForDWARFEncodingAndBitSize ("int", DW_ATE_signed, bit_size/2);
- return ClangASTType (ast, ast->getComplexType (GetQualType(complex_int_clang_type)));
+ CompilerType complex_int_clang_type = GetBuiltinTypeForDWARFEncodingAndBitSize ("int", DW_ATE_signed, bit_size/2);
+ return CompilerType (ast, ast->getComplexType (GetQualType(complex_int_clang_type)));
}
}
break;
case DW_ATE_complex_float:
if (QualTypeMatchesBitSize (bit_size, ast, ast->FloatComplexTy))
- return ClangASTType (ast, ast->FloatComplexTy);
+ return CompilerType (ast, ast->FloatComplexTy);
else if (QualTypeMatchesBitSize (bit_size, ast, ast->DoubleComplexTy))
- return ClangASTType (ast, ast->DoubleComplexTy);
+ return CompilerType (ast, ast->DoubleComplexTy);
else if (QualTypeMatchesBitSize (bit_size, ast, ast->LongDoubleComplexTy))
- return ClangASTType (ast, ast->LongDoubleComplexTy);
+ return CompilerType (ast, ast->LongDoubleComplexTy);
else
{
- ClangASTType complex_float_clang_type = GetBuiltinTypeForDWARFEncodingAndBitSize ("float", DW_ATE_float, bit_size/2);
- return ClangASTType (ast, ast->getComplexType (GetQualType(complex_float_clang_type)));
+ CompilerType complex_float_clang_type = GetBuiltinTypeForDWARFEncodingAndBitSize ("float", DW_ATE_float, bit_size/2);
+ return CompilerType (ast, ast->getComplexType (GetQualType(complex_float_clang_type)));
}
break;
case DW_ATE_float:
if (streq(type_name, "float") && QualTypeMatchesBitSize (bit_size, ast, ast->FloatTy))
- return ClangASTType (ast, ast->FloatTy);
+ return CompilerType (ast, ast->FloatTy);
if (streq(type_name, "double") && QualTypeMatchesBitSize (bit_size, ast, ast->DoubleTy))
- return ClangASTType (ast, ast->DoubleTy);
+ return CompilerType (ast, ast->DoubleTy);
if (streq(type_name, "long double") && QualTypeMatchesBitSize (bit_size, ast, ast->LongDoubleTy))
- return ClangASTType (ast, ast->LongDoubleTy);
+ return CompilerType (ast, ast->LongDoubleTy);
// Fall back to not requiring a name match
if (QualTypeMatchesBitSize (bit_size, ast, ast->FloatTy))
- return ClangASTType (ast, ast->FloatTy);
+ return CompilerType (ast, ast->FloatTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->DoubleTy))
- return ClangASTType (ast, ast->DoubleTy);
+ return CompilerType (ast, ast->DoubleTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->LongDoubleTy))
- return ClangASTType (ast, ast->LongDoubleTy);
+ return CompilerType (ast, ast->LongDoubleTy);
break;
case DW_ATE_signed:
@@ -928,57 +928,57 @@ ClangASTContext::GetBuiltinTypeForDWARFE
if (streq(type_name, "wchar_t") &&
QualTypeMatchesBitSize (bit_size, ast, ast->WCharTy) &&
(getTargetInfo() && TargetInfo::isTypeSigned (getTargetInfo()->getWCharType())))
- return ClangASTType (ast, ast->WCharTy);
+ return CompilerType (ast, ast->WCharTy);
if (streq(type_name, "void") &&
QualTypeMatchesBitSize (bit_size, ast, ast->VoidTy))
- return ClangASTType (ast, ast->VoidTy);
+ return CompilerType (ast, ast->VoidTy);
if (strstr(type_name, "long long") &&
QualTypeMatchesBitSize (bit_size, ast, ast->LongLongTy))
- return ClangASTType (ast, ast->LongLongTy);
+ return CompilerType (ast, ast->LongLongTy);
if (strstr(type_name, "long") &&
QualTypeMatchesBitSize (bit_size, ast, ast->LongTy))
- return ClangASTType (ast, ast->LongTy);
+ return CompilerType (ast, ast->LongTy);
if (strstr(type_name, "short") &&
QualTypeMatchesBitSize (bit_size, ast, ast->ShortTy))
- return ClangASTType (ast, ast->ShortTy);
+ return CompilerType (ast, ast->ShortTy);
if (strstr(type_name, "char"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->CharTy))
- return ClangASTType (ast, ast->CharTy);
+ return CompilerType (ast, ast->CharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->SignedCharTy))
- return ClangASTType (ast, ast->SignedCharTy);
+ return CompilerType (ast, ast->SignedCharTy);
}
if (strstr(type_name, "int"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->IntTy))
- return ClangASTType (ast, ast->IntTy);
+ return CompilerType (ast, ast->IntTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->Int128Ty))
- return ClangASTType (ast, ast->Int128Ty);
+ return CompilerType (ast, ast->Int128Ty);
}
}
// We weren't able to match up a type name, just search by size
if (QualTypeMatchesBitSize (bit_size, ast, ast->CharTy))
- return ClangASTType (ast, ast->CharTy);
+ return CompilerType (ast, ast->CharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->ShortTy))
- return ClangASTType (ast, ast->ShortTy);
+ return CompilerType (ast, ast->ShortTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->IntTy))
- return ClangASTType (ast, ast->IntTy);
+ return CompilerType (ast, ast->IntTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->LongTy))
- return ClangASTType (ast, ast->LongTy);
+ return CompilerType (ast, ast->LongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->LongLongTy))
- return ClangASTType (ast, ast->LongLongTy);
+ return CompilerType (ast, ast->LongLongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->Int128Ty))
- return ClangASTType (ast, ast->Int128Ty);
+ return CompilerType (ast, ast->Int128Ty);
break;
case DW_ATE_signed_char:
if (ast->getLangOpts().CharIsSigned && type_name && streq(type_name, "char"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->CharTy))
- return ClangASTType (ast, ast->CharTy);
+ return CompilerType (ast, ast->CharTy);
}
if (QualTypeMatchesBitSize (bit_size, ast, ast->SignedCharTy))
- return ClangASTType (ast, ast->SignedCharTy);
+ return CompilerType (ast, ast->SignedCharTy);
break;
case DW_ATE_unsigned:
@@ -989,62 +989,62 @@ ClangASTContext::GetBuiltinTypeForDWARFE
if (QualTypeMatchesBitSize (bit_size, ast, ast->WCharTy))
{
if (!(getTargetInfo() && TargetInfo::isTypeSigned (getTargetInfo()->getWCharType())))
- return ClangASTType (ast, ast->WCharTy);
+ return CompilerType (ast, ast->WCharTy);
}
}
if (strstr(type_name, "long long"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedLongLongTy))
- return ClangASTType (ast, ast->UnsignedLongLongTy);
+ return CompilerType (ast, ast->UnsignedLongLongTy);
}
else if (strstr(type_name, "long"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedLongTy))
- return ClangASTType (ast, ast->UnsignedLongTy);
+ return CompilerType (ast, ast->UnsignedLongTy);
}
else if (strstr(type_name, "short"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedShortTy))
- return ClangASTType (ast, ast->UnsignedShortTy);
+ return CompilerType (ast, ast->UnsignedShortTy);
}
else if (strstr(type_name, "char"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedCharTy))
- return ClangASTType (ast, ast->UnsignedCharTy);
+ return CompilerType (ast, ast->UnsignedCharTy);
}
else if (strstr(type_name, "int"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedIntTy))
- return ClangASTType (ast, ast->UnsignedIntTy);
+ return CompilerType (ast, ast->UnsignedIntTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedInt128Ty))
- return ClangASTType (ast, ast->UnsignedInt128Ty);
+ return CompilerType (ast, ast->UnsignedInt128Ty);
}
}
// We weren't able to match up a type name, just search by size
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedCharTy))
- return ClangASTType (ast, ast->UnsignedCharTy);
+ return CompilerType (ast, ast->UnsignedCharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedShortTy))
- return ClangASTType (ast, ast->UnsignedShortTy);
+ return CompilerType (ast, ast->UnsignedShortTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedIntTy))
- return ClangASTType (ast, ast->UnsignedIntTy);
+ return CompilerType (ast, ast->UnsignedIntTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedLongTy))
- return ClangASTType (ast, ast->UnsignedLongTy);
+ return CompilerType (ast, ast->UnsignedLongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedLongLongTy))
- return ClangASTType (ast, ast->UnsignedLongLongTy);
+ return CompilerType (ast, ast->UnsignedLongLongTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedInt128Ty))
- return ClangASTType (ast, ast->UnsignedInt128Ty);
+ return CompilerType (ast, ast->UnsignedInt128Ty);
break;
case DW_ATE_unsigned_char:
if (!ast->getLangOpts().CharIsSigned && type_name && streq(type_name, "char"))
{
if (QualTypeMatchesBitSize (bit_size, ast, ast->CharTy))
- return ClangASTType (ast, ast->CharTy);
+ return CompilerType (ast, ast->CharTy);
}
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedCharTy))
- return ClangASTType (ast, ast->UnsignedCharTy);
+ return CompilerType (ast, ast->UnsignedCharTy);
if (QualTypeMatchesBitSize (bit_size, ast, ast->UnsignedShortTy))
- return ClangASTType (ast, ast->UnsignedShortTy);
+ return CompilerType (ast, ast->UnsignedShortTy);
break;
case DW_ATE_imaginary_float:
@@ -1055,11 +1055,11 @@ ClangASTContext::GetBuiltinTypeForDWARFE
{
if (streq(type_name, "char16_t"))
{
- return ClangASTType (ast, ast->Char16Ty);
+ return CompilerType (ast, ast->Char16Ty);
}
else if (streq(type_name, "char32_t"))
{
- return ClangASTType (ast, ast->Char32Ty);
+ return CompilerType (ast, ast->Char32Ty);
}
}
break;
@@ -1075,18 +1075,18 @@ ClangASTContext::GetBuiltinTypeForDWARFE
{
Host::SystemLog (Host::eSystemLogError, "error: need to add support for DW_TAG_base_type encoded with DW_ATE = 0x%x, bit_size = %u\n", dw_ate, bit_size);
}
- return ClangASTType ();
+ return CompilerType ();
}
-ClangASTType
+CompilerType
ClangASTContext::GetUnknownAnyType(clang::ASTContext *ast)
{
if (ast)
- return ClangASTType (ast, ast->UnknownAnyTy);
- return ClangASTType();
+ return CompilerType (ast, ast->UnknownAnyTy);
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetCStringType (bool is_const)
{
ASTContext *ast = getASTContext();
@@ -1095,7 +1095,7 @@ ClangASTContext::GetCStringType (bool is
if (is_const)
char_type.addConst();
- return ClangASTType (ast, ast->getPointerType(char_type));
+ return CompilerType (ast, ast->getPointerType(char_type));
}
clang::DeclContext *
@@ -1104,14 +1104,14 @@ ClangASTContext::GetTranslationUnitDecl
return ast->getTranslationUnitDecl();
}
-ClangASTType
+CompilerType
ClangASTContext::CopyType (ASTContext *dst_ast,
- ClangASTType src)
+ CompilerType src)
{
FileSystemOptions file_system_options;
ClangASTContext *src_ast = src.GetTypeSystem()->AsClangASTContext();
if (src_ast == nullptr)
- return ClangASTType();
+ return CompilerType();
FileManager file_manager (file_system_options);
ASTImporter importer(*dst_ast, file_manager,
*src_ast->getASTContext(), file_manager,
@@ -1119,7 +1119,7 @@ ClangASTContext::CopyType (ASTContext *d
QualType dst (importer.Import(GetQualType(src)));
- return ClangASTType (dst_ast, dst);
+ return CompilerType (dst_ast, dst);
}
@@ -1138,8 +1138,8 @@ ClangASTContext::CopyDecl (ASTContext *d
}
bool
-ClangASTContext::AreTypesSame (ClangASTType type1,
- ClangASTType type2,
+ClangASTContext::AreTypesSame (CompilerType type1,
+ CompilerType type2,
bool ignore_qualifiers)
{
TypeSystem *ast = type1.GetTypeSystem();
@@ -1161,18 +1161,18 @@ ClangASTContext::AreTypesSame (ClangASTT
return ast->AsClangASTContext()->getASTContext()->hasSameType (type1_qual, type2_qual);
}
-ClangASTType
+CompilerType
ClangASTContext::GetTypeForDecl (clang::NamedDecl *decl)
{
if (clang::ObjCInterfaceDecl *interface_decl = llvm::dyn_cast<clang::ObjCInterfaceDecl>(decl))
return GetTypeForDecl(interface_decl);
if (clang::TagDecl *tag_decl = llvm::dyn_cast<clang::TagDecl>(decl))
return GetTypeForDecl(tag_decl);
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetTypeForDecl (TagDecl *decl)
{
// No need to call the getASTContext() accessor (which can create the AST
@@ -1180,11 +1180,11 @@ ClangASTContext::GetTypeForDecl (TagDecl
// AST if our AST didn't already exist...
ASTContext *ast = &decl->getASTContext();
if (ast)
- return ClangASTType (ast, ast->getTagDeclType(decl));
- return ClangASTType();
+ return CompilerType (ast, ast->getTagDeclType(decl));
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetTypeForDecl (ObjCInterfaceDecl *decl)
{
// No need to call the getASTContext() accessor (which can create the AST
@@ -1192,13 +1192,13 @@ ClangASTContext::GetTypeForDecl (ObjCInt
// AST if our AST didn't already exist...
ASTContext *ast = &decl->getASTContext();
if (ast)
- return ClangASTType (ast, ast->getObjCInterfaceType(decl));
- return ClangASTType();
+ return CompilerType (ast, ast->getObjCInterfaceType(decl));
+ return CompilerType();
}
#pragma mark Structure, Unions, Classes
-ClangASTType
+CompilerType
ClangASTContext::CreateRecordType (DeclContext *decl_ctx,
AccessType access_type,
const char *name,
@@ -1249,9 +1249,9 @@ ClangASTContext::CreateRecordType (DeclC
if (decl_ctx)
decl_ctx->addDecl (decl);
- return ClangASTType(ast, ast->getTagDeclType(decl));
+ return CompilerType(ast, ast->getTagDeclType(decl));
}
- return ClangASTType();
+ return CompilerType();
}
static TemplateParameterList *
@@ -1453,16 +1453,16 @@ ClangASTContext::CreateClassTemplateSpec
return class_template_specialization_decl;
}
-ClangASTType
+CompilerType
ClangASTContext::CreateClassTemplateSpecializationType (ClassTemplateSpecializationDecl *class_template_specialization_decl)
{
if (class_template_specialization_decl)
{
ASTContext *ast = getASTContext();
if (ast)
- return ClangASTType(ast, ast->getTagDeclType(class_template_specialization_decl));
+ return CompilerType(ast, ast->getTagDeclType(class_template_specialization_decl));
}
- return ClangASTType();
+ return CompilerType();
}
static inline bool
@@ -1590,7 +1590,7 @@ ClangASTContext::RecordHasFields (const
#pragma mark Objective C Classes
-ClangASTType
+CompilerType
ClangASTContext::CreateObjCClass
(
const char *name,
@@ -1619,7 +1619,7 @@ ClangASTContext::CreateObjCClass
if (decl && metadata)
SetMetadata(ast, decl, *metadata);
- return ClangASTType (ast, ast->getObjCInterfaceType(decl));
+ return CompilerType (ast, ast->getObjCInterfaceType(decl));
}
static inline bool
@@ -1764,7 +1764,7 @@ ClangASTContext::GetUniqueNamespaceDecla
FunctionDecl *
ClangASTContext::CreateFunctionDeclaration (DeclContext *decl_ctx,
const char *name,
- const ClangASTType &function_clang_type,
+ const CompilerType &function_clang_type,
int storage,
bool is_inline)
{
@@ -1815,10 +1815,10 @@ ClangASTContext::CreateFunctionDeclarati
return func_decl;
}
-ClangASTType
+CompilerType
ClangASTContext::CreateFunctionType (ASTContext *ast,
- const ClangASTType& result_type,
- const ClangASTType *args,
+ const CompilerType& result_type,
+ const CompilerType *args,
unsigned num_args,
bool is_variadic,
unsigned type_quals)
@@ -1835,13 +1835,13 @@ ClangASTContext::CreateFunctionType (AST
proto_info.TypeQuals = type_quals;
proto_info.RefQualifier = RQ_None;
- return ClangASTType (ast, ast->getFunctionType (GetQualType(result_type),
+ return CompilerType (ast, ast->getFunctionType (GetQualType(result_type),
qual_type_args,
proto_info));
}
ParmVarDecl *
-ClangASTContext::CreateParameterDeclaration (const char *name, const ClangASTType ¶m_type, int storage)
+ClangASTContext::CreateParameterDeclaration (const char *name, const CompilerType ¶m_type, int storage)
{
ASTContext *ast = getASTContext();
assert (ast != nullptr);
@@ -1866,8 +1866,8 @@ ClangASTContext::SetFunctionParameters (
#pragma mark Array Types
-ClangASTType
-ClangASTContext::CreateArrayType (const ClangASTType &element_type,
+CompilerType
+ClangASTContext::CreateArrayType (const CompilerType &element_type,
size_t element_count,
bool is_vector)
{
@@ -1878,7 +1878,7 @@ ClangASTContext::CreateArrayType (const
if (is_vector)
{
- return ClangASTType (ast, ast->getExtVectorType(GetQualType(element_type), element_count));
+ return CompilerType (ast, ast->getExtVectorType(GetQualType(element_type), element_count));
}
else
{
@@ -1886,28 +1886,28 @@ ClangASTContext::CreateArrayType (const
llvm::APInt ap_element_count (64, element_count);
if (element_count == 0)
{
- return ClangASTType (ast, ast->getIncompleteArrayType (GetQualType(element_type),
+ return CompilerType (ast, ast->getIncompleteArrayType (GetQualType(element_type),
ArrayType::Normal,
0));
}
else
{
- return ClangASTType (ast, ast->getConstantArrayType (GetQualType(element_type),
+ return CompilerType (ast, ast->getConstantArrayType (GetQualType(element_type),
ap_element_count,
ArrayType::Normal,
0));
}
}
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetOrCreateStructForIdentifier (const ConstString &type_name,
- const std::initializer_list< std::pair < const char *, ClangASTType > >& type_fields,
+ const std::initializer_list< std::pair < const char *, CompilerType > >& type_fields,
bool packed)
{
- ClangASTType type;
+ CompilerType type;
if ((type = GetTypeForIdentifier<clang::CXXRecordDecl>(type_name)).IsValid())
return type;
type = CreateRecordType(nullptr, lldb::eAccessPublic, type_name.GetCString(), clang::TTK_Struct, lldb::eLanguageTypeC);
@@ -1922,13 +1922,13 @@ ClangASTContext::GetOrCreateStructForIde
#pragma mark Enumeration Types
-ClangASTType
+CompilerType
ClangASTContext::CreateEnumerationType
(
const char *name,
DeclContext *decl_ctx,
const Declaration &decl,
- const ClangASTType &integer_clang_type
+ const CompilerType &integer_clang_type
)
{
// TODO: Do something intelligent with the Declaration object passed in
@@ -1957,9 +1957,9 @@ ClangASTContext::CreateEnumerationType
enum_decl->setAccess(AS_public); // TODO respect what's in the debug info
- return ClangASTType (ast, ast->getTagDeclType(enum_decl));
+ return CompilerType (ast, ast->getTagDeclType(enum_decl));
}
- return ClangASTType();
+ return CompilerType();
}
// Disable this for now since I can't seem to get a nicely formatted float
@@ -2003,7 +2003,7 @@ ClangASTContext::CreateEnumerationType
// return false;
//}
-ClangASTType
+CompilerType
ClangASTContext::GetIntTypeFromBitSize (clang::ASTContext *ast,
size_t bit_size, bool is_signed)
{
@@ -2012,71 +2012,71 @@ ClangASTContext::GetIntTypeFromBitSize (
if (is_signed)
{
if (bit_size == ast->getTypeSize(ast->SignedCharTy))
- return ClangASTType(ast, ast->SignedCharTy);
+ return CompilerType(ast, ast->SignedCharTy);
if (bit_size == ast->getTypeSize(ast->ShortTy))
- return ClangASTType(ast, ast->ShortTy);
+ return CompilerType(ast, ast->ShortTy);
if (bit_size == ast->getTypeSize(ast->IntTy))
- return ClangASTType(ast, ast->IntTy);
+ return CompilerType(ast, ast->IntTy);
if (bit_size == ast->getTypeSize(ast->LongTy))
- return ClangASTType(ast, ast->LongTy);
+ return CompilerType(ast, ast->LongTy);
if (bit_size == ast->getTypeSize(ast->LongLongTy))
- return ClangASTType(ast, ast->LongLongTy);
+ return CompilerType(ast, ast->LongLongTy);
if (bit_size == ast->getTypeSize(ast->Int128Ty))
- return ClangASTType(ast, ast->Int128Ty);
+ return CompilerType(ast, ast->Int128Ty);
}
else
{
if (bit_size == ast->getTypeSize(ast->UnsignedCharTy))
- return ClangASTType(ast, ast->UnsignedCharTy);
+ return CompilerType(ast, ast->UnsignedCharTy);
if (bit_size == ast->getTypeSize(ast->UnsignedShortTy))
- return ClangASTType(ast, ast->UnsignedShortTy);
+ return CompilerType(ast, ast->UnsignedShortTy);
if (bit_size == ast->getTypeSize(ast->UnsignedIntTy))
- return ClangASTType(ast, ast->UnsignedIntTy);
+ return CompilerType(ast, ast->UnsignedIntTy);
if (bit_size == ast->getTypeSize(ast->UnsignedLongTy))
- return ClangASTType(ast, ast->UnsignedLongTy);
+ return CompilerType(ast, ast->UnsignedLongTy);
if (bit_size == ast->getTypeSize(ast->UnsignedLongLongTy))
- return ClangASTType(ast, ast->UnsignedLongLongTy);
+ return CompilerType(ast, ast->UnsignedLongLongTy);
if (bit_size == ast->getTypeSize(ast->UnsignedInt128Ty))
- return ClangASTType(ast, ast->UnsignedInt128Ty);
+ return CompilerType(ast, ast->UnsignedInt128Ty);
}
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetPointerSizedIntType (clang::ASTContext *ast, bool is_signed)
{
if (ast)
return GetIntTypeFromBitSize(ast, ast->getTypeSize(ast->VoidPtrTy), is_signed);
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetFloatTypeFromBitSize (clang::ASTContext *ast,
size_t bit_size)
{
if (ast)
{
if (bit_size == ast->getTypeSize(ast->FloatTy))
- return ClangASTType(ast, ast->FloatTy);
+ return CompilerType(ast, ast->FloatTy);
else if (bit_size == ast->getTypeSize(ast->DoubleTy))
- return ClangASTType(ast, ast->DoubleTy);
+ return CompilerType(ast, ast->DoubleTy);
else if (bit_size == ast->getTypeSize(ast->LongDoubleTy))
- return ClangASTType(ast, ast->LongDoubleTy);
+ return CompilerType(ast, ast->LongDoubleTy);
else if (bit_size == ast->getTypeSize(ast->HalfTy))
- return ClangASTType(ast, ast->HalfTy);
+ return CompilerType(ast, ast->HalfTy);
}
- return ClangASTType();
+ return CompilerType();
}
bool
@@ -2482,7 +2482,7 @@ ClangASTContext::IsAggregateType (void*
bool
ClangASTContext::IsArrayType (void* type,
- ClangASTType *element_type_ptr,
+ CompilerType *element_type_ptr,
uint64_t *size,
bool *is_incomplete)
{
@@ -2551,7 +2551,7 @@ ClangASTContext::IsArrayType (void* type
bool
ClangASTContext::IsVectorType (void* type,
- ClangASTType *element_type,
+ CompilerType *element_type,
uint64_t *size)
{
clang::QualType qual_type (GetCanonicalQualType(type));
@@ -2567,7 +2567,7 @@ ClangASTContext::IsVectorType (void* typ
if (size)
*size = vector_type->getNumElements();
if (element_type)
- *element_type = ClangASTType(getASTContext(), vector_type->getElementType());
+ *element_type = CompilerType(getASTContext(), vector_type->getElementType());
}
return true;
}
@@ -2580,7 +2580,7 @@ ClangASTContext::IsVectorType (void* typ
if (size)
*size = ext_vector_type->getNumElements();
if (element_type)
- *element_type = ClangASTType(getASTContext(), ext_vector_type->getElementType());
+ *element_type = CompilerType(getASTContext(), ext_vector_type->getElementType());
}
return true;
}
@@ -2631,7 +2631,7 @@ ClangASTContext::IsConst(void* type)
bool
ClangASTContext::IsCStringType (void* type, uint32_t &length)
{
- ClangASTType pointee_or_element_clang_type;
+ CompilerType pointee_or_element_clang_type;
length = 0;
Flags type_flags (GetTypeInfo (type, &pointee_or_element_clang_type));
@@ -2701,7 +2701,7 @@ ClangASTContext::IsFunctionType (void* t
// Used to detect "Homogeneous Floating-point Aggregates"
uint32_t
-ClangASTContext::IsHomogeneousAggregate (void* type, ClangASTType* base_type_ptr)
+ClangASTContext::IsHomogeneousAggregate (void* type, CompilerType* base_type_ptr)
{
if (!type)
return 0;
@@ -2777,7 +2777,7 @@ ClangASTContext::IsHomogeneousAggregate
++num_fields;
}
if (base_type_ptr)
- *base_type_ptr = ClangASTType (getASTContext(), base_qual_type);
+ *base_type_ptr = CompilerType (getASTContext(), base_qual_type);
return num_fields;
}
}
@@ -2808,7 +2808,7 @@ ClangASTContext::GetNumberOfFunctionArgu
return 0;
}
-ClangASTType
+CompilerType
ClangASTContext::GetFunctionArgumentAtIndex (void* type, const size_t index)
{
if (type)
@@ -2818,10 +2818,10 @@ ClangASTContext::GetFunctionArgumentAtIn
if (func)
{
if (index < func->getNumParams())
- return ClangASTType(getASTContext(), func->getParamType(index));
+ return CompilerType(getASTContext(), func->getParamType(index));
}
}
- return ClangASTType();
+ return CompilerType();
}
bool
@@ -2882,7 +2882,7 @@ ClangASTContext::IsIntegerType (void* ty
}
bool
-ClangASTContext::IsPointerType (void* type, ClangASTType *pointee_type)
+ClangASTContext::IsPointerType (void* type, CompilerType *pointee_type)
{
if (type)
{
@@ -2933,7 +2933,7 @@ ClangASTContext::IsPointerType (void* ty
bool
-ClangASTContext::IsPointerOrReferenceType (void* type, ClangASTType *pointee_type)
+ClangASTContext::IsPointerOrReferenceType (void* type, CompilerType *pointee_type)
{
if (type)
{
@@ -2992,7 +2992,7 @@ ClangASTContext::IsPointerOrReferenceTyp
bool
-ClangASTContext::IsReferenceType (void* type, ClangASTType *pointee_type, bool* is_rvalue)
+ClangASTContext::IsReferenceType (void* type, CompilerType *pointee_type, bool* is_rvalue)
{
if (type)
{
@@ -3101,7 +3101,7 @@ ClangASTContext::IsDefined(void* type)
}
bool
-ClangASTContext::IsObjCClassType (const ClangASTType& type)
+ClangASTContext::IsObjCClassType (const CompilerType& type)
{
if (type)
{
@@ -3116,7 +3116,7 @@ ClangASTContext::IsObjCClassType (const
}
bool
-ClangASTContext::IsObjCObjectOrInterfaceType (const ClangASTType& type)
+ClangASTContext::IsObjCObjectOrInterfaceType (const CompilerType& type)
{
if (type)
return GetCanonicalQualType(type)->isObjCObjectOrInterfaceType();
@@ -3154,7 +3154,7 @@ ClangASTContext::IsPolymorphicClass (voi
}
bool
-ClangASTContext::IsPossibleDynamicType (void* type, ClangASTType *dynamic_pointee_type,
+ClangASTContext::IsPossibleDynamicType (void* type, CompilerType *dynamic_pointee_type,
bool check_cplusplus,
bool check_objc)
{
@@ -3295,7 +3295,7 @@ ClangASTContext::IsPossibleDynamicType (
success = metadata->GetIsDynamicCXXType();
else
{
- is_complete = ClangASTType(getASTContext(), pointee_qual_type).GetCompleteType();
+ is_complete = CompilerType(getASTContext(), pointee_qual_type).GetCompleteType();
if (is_complete)
success = cxx_record_decl->isDynamicClass();
else
@@ -3360,7 +3360,7 @@ ClangASTContext::IsVoidType (void* type)
}
bool
-ClangASTContext::GetCXXClassName (const ClangASTType& type, std::string &class_name)
+ClangASTContext::GetCXXClassName (const CompilerType& type, std::string &class_name)
{
if (type)
{
@@ -3379,7 +3379,7 @@ ClangASTContext::GetCXXClassName (const
bool
-ClangASTContext::IsCXXClassType (const ClangASTType& type)
+ClangASTContext::IsCXXClassType (const CompilerType& type)
{
if (!type)
return false;
@@ -3403,7 +3403,7 @@ ClangASTContext::IsBeingDefined (void* t
}
bool
-ClangASTContext::IsObjCObjectPointerType (const ClangASTType& type, ClangASTType *class_type_ptr)
+ClangASTContext::IsObjCObjectPointerType (const CompilerType& type, CompilerType *class_type_ptr)
{
if (!type)
return false;
@@ -3432,7 +3432,7 @@ ClangASTContext::IsObjCObjectPointerType
}
bool
-ClangASTContext::GetObjCClassName (const ClangASTType& type, std::string &class_name)
+ClangASTContext::GetObjCClassName (const CompilerType& type, std::string &class_name)
{
if (!type)
return false;
@@ -3491,7 +3491,7 @@ ClangASTContext::GetTypeName (void* type
}
uint32_t
-ClangASTContext::GetTypeInfo (void* type, ClangASTType *pointee_or_element_clang_type)
+ClangASTContext::GetTypeInfo (void* type, CompilerType *pointee_or_element_clang_type)
{
if (!type)
return 0;
@@ -3602,9 +3602,9 @@ ClangASTContext::GetTypeInfo (void* type
return eTypeIsEnumeration | eTypeHasValue;
case clang::Type::Elaborated:
- return ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetTypeInfo (pointee_or_element_clang_type);
+ return CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetTypeInfo (pointee_or_element_clang_type);
case clang::Type::Paren:
- return ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetTypeInfo (pointee_or_element_clang_type);
+ return CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetTypeInfo (pointee_or_element_clang_type);
case clang::Type::FunctionProto: return eTypeIsFuncPrototype | eTypeHasValue;
case clang::Type::FunctionNoProto: return eTypeIsFuncPrototype | eTypeHasValue;
@@ -3642,7 +3642,7 @@ ClangASTContext::GetTypeInfo (void* type
case clang::Type::TemplateSpecialization: return eTypeIsTemplate;
case clang::Type::Typedef:
- return eTypeIsTypedef | ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetTypeInfo (pointee_or_element_clang_type);
+ return eTypeIsTypedef | CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetTypeInfo (pointee_or_element_clang_type);
case clang::Type::TypeOfExpr: return 0;
case clang::Type::TypeOf: return 0;
case clang::Type::UnresolvedUsing: return 0;
@@ -3746,7 +3746,7 @@ ClangASTContext::GetMinimumLanguage (voi
}
break;
case clang::Type::Typedef:
- return ClangASTType(getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetMinimumLanguage();
+ return CompilerType(getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetMinimumLanguage();
}
}
return lldb::eLanguageTypeC;
@@ -3802,9 +3802,9 @@ ClangASTContext::GetTypeClass (void* typ
case clang::Type::Typedef: return lldb::eTypeClassTypedef;
case clang::Type::UnresolvedUsing: break;
case clang::Type::Paren:
- return ClangASTType(getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetTypeClass();
+ return CompilerType(getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetTypeClass();
case clang::Type::Elaborated:
- return ClangASTType(getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetTypeClass();
+ return CompilerType(getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetTypeClass();
case clang::Type::Attributed: break;
case clang::Type::TemplateTypeParm: break;
@@ -3843,43 +3843,43 @@ ClangASTContext::GetTypeQualifiers(void*
// Creating related types
//----------------------------------------------------------------------
-ClangASTType
-ClangASTContext::AddConstModifier (const ClangASTType& type)
+CompilerType
+ClangASTContext::AddConstModifier (const CompilerType& type)
{
if (type && type.GetTypeSystem()->AsClangASTContext())
{
clang::QualType result(GetQualType(type));
result.addConst();
- return ClangASTType (type.GetTypeSystem(), result.getAsOpaquePtr());
+ return CompilerType (type.GetTypeSystem(), result.getAsOpaquePtr());
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::AddRestrictModifier (const ClangASTType& type)
+CompilerType
+ClangASTContext::AddRestrictModifier (const CompilerType& type)
{
if (type && type.GetTypeSystem()->AsClangASTContext())
{
clang::QualType result(GetQualType(type));
result.getQualifiers().setRestrict (true);
- return ClangASTType (type.GetTypeSystem(), result.getAsOpaquePtr());
+ return CompilerType (type.GetTypeSystem(), result.getAsOpaquePtr());
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::AddVolatileModifier (const ClangASTType& type)
+CompilerType
+ClangASTContext::AddVolatileModifier (const CompilerType& type)
{
if (type && type.GetTypeSystem()->AsClangASTContext())
{
clang::QualType result(GetQualType(type));
result.getQualifiers().setVolatile (true);
- return ClangASTType (type.GetTypeSystem(), result.getAsOpaquePtr());
+ return CompilerType (type.GetTypeSystem(), result.getAsOpaquePtr());
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetArrayElementType (void* type, uint64_t *stride)
{
if (type)
@@ -3889,9 +3889,9 @@ ClangASTContext::GetArrayElementType (vo
const clang::Type *array_eletype = qual_type.getTypePtr()->getArrayElementTypeNoTypeQual();
if (!array_eletype)
- return ClangASTType();
+ return CompilerType();
- ClangASTType element_type (getASTContext(), array_eletype->getCanonicalTypeUnqualified());
+ CompilerType element_type (getASTContext(), array_eletype->getCanonicalTypeUnqualified());
// TODO: the real stride will be >= this value.. find the real one!
if (stride)
@@ -3900,15 +3900,15 @@ ClangASTContext::GetArrayElementType (vo
return element_type;
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetCanonicalType (void* type)
{
if (type)
- return ClangASTType (getASTContext(), GetCanonicalQualType(type));
- return ClangASTType();
+ return CompilerType (getASTContext(), GetCanonicalQualType(type));
+ return CompilerType();
}
static clang::QualType
@@ -3924,12 +3924,12 @@ GetFullyUnqualifiedType_Impl (clang::AST
return qual_type;
}
-ClangASTType
+CompilerType
ClangASTContext::GetFullyUnqualifiedType (void* type)
{
if (type)
- return ClangASTType(getASTContext(), GetFullyUnqualifiedType_Impl(getASTContext(), GetQualType(type)));
- return ClangASTType();
+ return CompilerType(getASTContext(), GetFullyUnqualifiedType_Impl(getASTContext(), GetQualType(type)));
+ return CompilerType();
}
@@ -3945,7 +3945,7 @@ ClangASTContext::GetFunctionArgumentCoun
return -1;
}
-ClangASTType
+CompilerType
ClangASTContext::GetFunctionArgumentTypeAtIndex (void* type, size_t idx)
{
if (type)
@@ -3955,13 +3955,13 @@ ClangASTContext::GetFunctionArgumentType
{
const uint32_t num_args = func->getNumParams();
if (idx < num_args)
- return ClangASTType(getASTContext(), func->getParamType(idx));
+ return CompilerType(getASTContext(), func->getParamType(idx));
}
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetFunctionReturnType (void* type)
{
if (type)
@@ -3969,9 +3969,9 @@ ClangASTContext::GetFunctionReturnType (
clang::QualType qual_type(GetCanonicalQualType(type));
const clang::FunctionProtoType* func = llvm::dyn_cast<clang::FunctionProtoType>(qual_type.getTypePtr());
if (func)
- return ClangASTType(getASTContext(), func->getReturnType());
+ return CompilerType(getASTContext(), func->getReturnType());
}
- return ClangASTType();
+ return CompilerType();
}
size_t
@@ -4023,13 +4023,13 @@ ClangASTContext::GetNumMemberFunctions (
case clang::Type::Typedef:
- return ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetNumMemberFunctions();
+ return CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetNumMemberFunctions();
case clang::Type::Elaborated:
- return ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetNumMemberFunctions();
+ return CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetNumMemberFunctions();
case clang::Type::Paren:
- return ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetNumMemberFunctions();
+ return CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetNumMemberFunctions();
default:
break;
@@ -4043,7 +4043,7 @@ ClangASTContext::GetMemberFunctionAtInde
{
std::string name("");
MemberFunctionKind kind(MemberFunctionKind::eMemberFunctionKindUnknown);
- ClangASTType clang_type{};
+ CompilerType clang_type{};
clang::ObjCMethodDecl *method_decl(nullptr);
if (type)
{
@@ -4078,7 +4078,7 @@ ClangASTContext::GetMemberFunctionAtInde
kind = lldb::eMemberFunctionKindDestructor;
else
kind = lldb::eMemberFunctionKindInstanceMethod;
- clang_type = ClangASTType(getASTContext(),method_decl->getType());
+ clang_type = CompilerType(getASTContext(),method_decl->getType());
}
}
}
@@ -4168,40 +4168,40 @@ ClangASTContext::GetMemberFunctionAtInde
return TypeMemberFunctionImpl();
}
-ClangASTType
-ClangASTContext::GetLValueReferenceType (const ClangASTType& type)
+CompilerType
+ClangASTContext::GetLValueReferenceType (const CompilerType& type)
{
if (type)
{
ClangASTContext* ast = type.GetTypeSystem()->AsClangASTContext();
if (ast)
- return ClangASTType(ast->getASTContext(), ast->getASTContext()->getLValueReferenceType(GetQualType(type)));
+ return CompilerType(ast->getASTContext(), ast->getASTContext()->getLValueReferenceType(GetQualType(type)));
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::GetRValueReferenceType (const ClangASTType& type)
+CompilerType
+ClangASTContext::GetRValueReferenceType (const CompilerType& type)
{
if (type)
{
ClangASTContext* ast = type.GetTypeSystem()->AsClangASTContext();
if (ast)
- return ClangASTType(ast->getASTContext(), ast->getASTContext()->getRValueReferenceType(GetQualType(type)));
+ return CompilerType(ast->getASTContext(), ast->getASTContext()->getRValueReferenceType(GetQualType(type)));
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetNonReferenceType (void* type)
{
if (type)
- return ClangASTType(getASTContext(), GetQualType(type).getNonReferenceType());
- return ClangASTType();
+ return CompilerType(getASTContext(), GetQualType(type).getNonReferenceType());
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::CreateTypedefType (const ClangASTType& type,
+CompilerType
+ClangASTContext::CreateTypedefType (const CompilerType& type,
const char *typedef_name,
clang::DeclContext *decl_ctx)
{
@@ -4209,7 +4209,7 @@ ClangASTContext::CreateTypedefType (cons
{
ClangASTContext* ast = type.GetTypeSystem()->AsClangASTContext();
if (!ast)
- return ClangASTType();
+ return CompilerType();
clang::ASTContext* clang_ast = ast->getASTContext();
clang::QualType qual_type (GetQualType(type));
if (decl_ctx == nullptr)
@@ -4224,24 +4224,24 @@ ClangASTContext::CreateTypedefType (cons
decl->setAccess(clang::AS_public); // TODO respect proper access specifier
// Get a uniqued clang::QualType for the typedef decl type
- return ClangASTType (clang_ast, clang_ast->getTypedefType (decl));
+ return CompilerType (clang_ast, clang_ast->getTypedefType (decl));
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetPointeeType (void* type)
{
if (type)
{
clang::QualType qual_type(GetQualType(type));
- return ClangASTType (getASTContext(), qual_type.getTypePtr()->getPointeeType());
+ return CompilerType (getASTContext(), qual_type.getTypePtr()->getPointeeType());
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetPointerType (void* type)
{
if (type)
@@ -4253,35 +4253,35 @@ ClangASTContext::GetPointerType (void* t
{
case clang::Type::ObjCObject:
case clang::Type::ObjCInterface:
- return ClangASTType(getASTContext(), getASTContext()->getObjCObjectPointerType(qual_type));
+ return CompilerType(getASTContext(), getASTContext()->getObjCObjectPointerType(qual_type));
default:
- return ClangASTType(getASTContext(), getASTContext()->getPointerType(qual_type));
+ return CompilerType(getASTContext(), getASTContext()->getPointerType(qual_type));
}
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ClangASTContext::GetTypedefedType (void* type)
{
if (type)
{
const clang::TypedefType *typedef_type = llvm::dyn_cast<clang::TypedefType>(GetQualType(type));
if (typedef_type)
- return ClangASTType (getASTContext(), typedef_type->getDecl()->getUnderlyingType());
+ return CompilerType (getASTContext(), typedef_type->getDecl()->getUnderlyingType());
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::RemoveFastQualifiers (const ClangASTType& type)
+CompilerType
+ClangASTContext::RemoveFastQualifiers (const CompilerType& type)
{
if (type && type.GetTypeSystem()->AsClangASTContext())
{
clang::QualType qual_type(GetQualType(type));
qual_type.getQualifiers().removeFastQualifiers();
- return ClangASTType (type.GetTypeSystem(), qual_type.getAsOpaquePtr());
+ return CompilerType (type.GetTypeSystem(), qual_type.getAsOpaquePtr());
}
return type;
}
@@ -4291,12 +4291,12 @@ ClangASTContext::RemoveFastQualifiers (c
// Create related types using the current type's AST
//----------------------------------------------------------------------
-ClangASTType
+CompilerType
ClangASTContext::GetBasicTypeFromAST (void* type, lldb::BasicType basic_type)
{
if (type)
return ClangASTContext::GetBasicType(getASTContext(), basic_type);
- return ClangASTType();
+ return CompilerType();
}
//----------------------------------------------------------------------
// Exploring the type
@@ -4321,7 +4321,7 @@ ClangASTContext::GetBitSize (void* type,
if (objc_runtime)
{
uint64_t bit_size = 0;
- if (objc_runtime->GetTypeBitSize(ClangASTType(getASTContext(), qual_type), bit_size))
+ if (objc_runtime->GetTypeBitSize(CompilerType(getASTContext(), qual_type), bit_size))
return bit_size;
}
}
@@ -4473,7 +4473,7 @@ ClangASTContext::GetEncoding (void* type
{
const clang::ComplexType *complex_type = qual_type->getAsComplexIntegerType();
if (complex_type)
- encoding = ClangASTType(getASTContext(), complex_type->getElementType()).GetEncoding(count);
+ encoding = CompilerType(getASTContext(), complex_type->getElementType()).GetEncoding(count);
else
encoding = lldb::eEncodingSint;
}
@@ -4485,13 +4485,13 @@ ClangASTContext::GetEncoding (void* type
case clang::Type::Record: break;
case clang::Type::Enum: return lldb::eEncodingSint;
case clang::Type::Typedef:
- return ClangASTType(getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetEncoding(count);
+ return CompilerType(getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetEncoding(count);
case clang::Type::Elaborated:
- return ClangASTType(getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetEncoding(count);
+ return CompilerType(getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetEncoding(count);
case clang::Type::Paren:
- return ClangASTType(getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetEncoding(count);
+ return CompilerType(getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetEncoding(count);
case clang::Type::DependentSizedArray:
case clang::Type::DependentSizedExtVector:
@@ -4620,13 +4620,13 @@ ClangASTContext::GetFormat (void* type)
case clang::Type::Record: break;
case clang::Type::Enum: return lldb::eFormatEnum;
case clang::Type::Typedef:
- return ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetFormat();
+ return CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetFormat();
case clang::Type::Auto:
- return ClangASTType (getASTContext(), llvm::cast<clang::AutoType>(qual_type)->desugar()).GetFormat();
+ return CompilerType (getASTContext(), llvm::cast<clang::AutoType>(qual_type)->desugar()).GetFormat();
case clang::Type::Paren:
- return ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetFormat();
+ return CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetFormat();
case clang::Type::Elaborated:
- return ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetFormat();
+ return CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetFormat();
case clang::Type::DependentSizedArray:
case clang::Type::DependentSizedExtVector:
case clang::Type::UnresolvedUsing:
@@ -4775,7 +4775,7 @@ ClangASTContext::GetNumChildren (void* t
{
const clang::ObjCObjectPointerType *pointer_type = llvm::cast<clang::ObjCObjectPointerType>(qual_type.getTypePtr());
clang::QualType pointee_type = pointer_type->getPointeeType();
- uint32_t num_pointee_children = ClangASTType (getASTContext(),pointee_type).GetNumChildren (omit_empty_base_classes);
+ uint32_t num_pointee_children = CompilerType (getASTContext(),pointee_type).GetNumChildren (omit_empty_base_classes);
// If this type points to a simple type, then it has 1 child
if (num_pointee_children == 0)
num_children = 1;
@@ -4797,7 +4797,7 @@ ClangASTContext::GetNumChildren (void* t
{
const clang::PointerType *pointer_type = llvm::cast<clang::PointerType>(qual_type.getTypePtr());
clang::QualType pointee_type (pointer_type->getPointeeType());
- uint32_t num_pointee_children = ClangASTType (getASTContext(),pointee_type).GetNumChildren (omit_empty_base_classes);
+ uint32_t num_pointee_children = CompilerType (getASTContext(),pointee_type).GetNumChildren (omit_empty_base_classes);
if (num_pointee_children == 0)
{
// We have a pointer to a pointee type that claims it has no children.
@@ -4814,7 +4814,7 @@ ClangASTContext::GetNumChildren (void* t
{
const clang::ReferenceType *reference_type = llvm::cast<clang::ReferenceType>(qual_type.getTypePtr());
clang::QualType pointee_type = reference_type->getPointeeType();
- uint32_t num_pointee_children = ClangASTType (getASTContext(), pointee_type).GetNumChildren (omit_empty_base_classes);
+ uint32_t num_pointee_children = CompilerType (getASTContext(), pointee_type).GetNumChildren (omit_empty_base_classes);
// If this type points to a simple type, then it has 1 child
if (num_pointee_children == 0)
num_children = 1;
@@ -4825,15 +4825,15 @@ ClangASTContext::GetNumChildren (void* t
case clang::Type::Typedef:
- num_children = ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetNumChildren (omit_empty_base_classes);
+ num_children = CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetNumChildren (omit_empty_base_classes);
break;
case clang::Type::Elaborated:
- num_children = ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetNumChildren (omit_empty_base_classes);
+ num_children = CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetNumChildren (omit_empty_base_classes);
break;
case clang::Type::Paren:
- num_children = ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetNumChildren (omit_empty_base_classes);
+ num_children = CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetNumChildren (omit_empty_base_classes);
break;
default:
break;
@@ -4908,7 +4908,7 @@ ClangASTContext::GetBasicTypeEnumeration
#pragma mark Aggregate Types
uint32_t
-ClangASTContext::GetNumDirectBaseClasses (const ClangASTType& type)
+ClangASTContext::GetNumDirectBaseClasses (const CompilerType& type)
{
if (!type)
return 0;
@@ -4963,15 +4963,15 @@ ClangASTContext::GetNumDirectBaseClasses
case clang::Type::Typedef:
- count = GetNumDirectBaseClasses(ClangASTType (ast->getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()));
+ count = GetNumDirectBaseClasses(CompilerType (ast->getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()));
break;
case clang::Type::Elaborated:
- count = GetNumDirectBaseClasses(ClangASTType (ast->getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()));
+ count = GetNumDirectBaseClasses(CompilerType (ast->getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()));
break;
case clang::Type::Paren:
- return GetNumDirectBaseClasses(ClangASTType (ast->getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()));
+ return GetNumDirectBaseClasses(CompilerType (ast->getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()));
default:
break;
@@ -4980,7 +4980,7 @@ ClangASTContext::GetNumDirectBaseClasses
}
uint32_t
-ClangASTContext::GetNumVirtualBaseClasses (const ClangASTType& type)
+ClangASTContext::GetNumVirtualBaseClasses (const CompilerType& type)
{
if (!type)
return 0;
@@ -5003,15 +5003,15 @@ ClangASTContext::GetNumVirtualBaseClasse
break;
case clang::Type::Typedef:
- count = GetNumVirtualBaseClasses(ClangASTType (ast->getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()));
+ count = GetNumVirtualBaseClasses(CompilerType (ast->getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()));
break;
case clang::Type::Elaborated:
- count = GetNumVirtualBaseClasses(ClangASTType (ast->getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()));
+ count = GetNumVirtualBaseClasses(CompilerType (ast->getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()));
break;
case clang::Type::Paren:
- count = GetNumVirtualBaseClasses(ClangASTType (ast->getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()));
+ count = GetNumVirtualBaseClasses(CompilerType (ast->getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()));
break;
default:
@@ -5051,15 +5051,15 @@ ClangASTContext::GetNumFields (void* typ
break;
case clang::Type::Typedef:
- count = ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetNumFields();
+ count = CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetNumFields();
break;
case clang::Type::Elaborated:
- count = ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetNumFields();
+ count = CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetNumFields();
break;
case clang::Type::Paren:
- count = ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetNumFields();
+ count = CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetNumFields();
break;
case clang::Type::ObjCObjectPointer:
@@ -5097,14 +5097,14 @@ ClangASTContext::GetNumFields (void* typ
return count;
}
-ClangASTType
-ClangASTContext::GetDirectBaseClassAtIndex (const ClangASTType& type, size_t idx, uint32_t *bit_offset_ptr)
+CompilerType
+ClangASTContext::GetDirectBaseClassAtIndex (const CompilerType& type, size_t idx, uint32_t *bit_offset_ptr)
{
if (!type)
- return ClangASTType();
+ return CompilerType();
ClangASTContext *ast = type.GetTypeSystem()->AsClangASTContext();
if (!ast)
- return ClangASTType();
+ return CompilerType();
clang::QualType qual_type(GetCanonicalQualType(type));
const clang::Type::TypeClass type_class = qual_type->getTypeClass();
@@ -5133,7 +5133,7 @@ ClangASTContext::GetDirectBaseClassAtInd
else
*bit_offset_ptr = record_layout.getBaseClassOffset(base_class_decl).getQuantity() * 8;
}
- return ClangASTType (ast, base_class->getType().getAsOpaquePtr());
+ return CompilerType (ast, base_class->getType().getAsOpaquePtr());
}
}
}
@@ -5158,7 +5158,7 @@ ClangASTContext::GetDirectBaseClassAtInd
{
if (bit_offset_ptr)
*bit_offset_ptr = 0;
- return ClangASTType (ast->getASTContext(), ast->getASTContext()->getObjCInterfaceType(superclass_interface_decl));
+ return CompilerType (ast->getASTContext(), ast->getASTContext()->getObjCInterfaceType(superclass_interface_decl));
}
}
}
@@ -5179,7 +5179,7 @@ ClangASTContext::GetDirectBaseClassAtInd
{
if (bit_offset_ptr)
*bit_offset_ptr = 0;
- return ClangASTType (ast->getASTContext(), ast->getASTContext()->getObjCInterfaceType(superclass_interface_decl));
+ return CompilerType (ast->getASTContext(), ast->getASTContext()->getObjCInterfaceType(superclass_interface_decl));
}
}
}
@@ -5188,28 +5188,28 @@ ClangASTContext::GetDirectBaseClassAtInd
case clang::Type::Typedef:
- return GetDirectBaseClassAtIndex (ClangASTType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()), idx, bit_offset_ptr);
+ return GetDirectBaseClassAtIndex (CompilerType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()), idx, bit_offset_ptr);
case clang::Type::Elaborated:
- return GetDirectBaseClassAtIndex (ClangASTType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()), idx, bit_offset_ptr);
+ return GetDirectBaseClassAtIndex (CompilerType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()), idx, bit_offset_ptr);
case clang::Type::Paren:
- return GetDirectBaseClassAtIndex (ClangASTType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()), idx, bit_offset_ptr);
+ return GetDirectBaseClassAtIndex (CompilerType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()), idx, bit_offset_ptr);
default:
break;
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::GetVirtualBaseClassAtIndex (const ClangASTType& type, size_t idx, uint32_t *bit_offset_ptr)
+CompilerType
+ClangASTContext::GetVirtualBaseClassAtIndex (const CompilerType& type, size_t idx, uint32_t *bit_offset_ptr)
{
if (!type)
- return ClangASTType();
+ return CompilerType();
ClangASTContext *ast = type.GetTypeSystem()->AsClangASTContext();
if (!ast)
- return ClangASTType();
+ return CompilerType();
clang::QualType qual_type(GetCanonicalQualType(type));
const clang::Type::TypeClass type_class = qual_type->getTypeClass();
@@ -5236,7 +5236,7 @@ ClangASTContext::GetVirtualBaseClassAtIn
*bit_offset_ptr = record_layout.getVBaseClassOffset(base_class_decl).getQuantity() * 8;
}
- return ClangASTType (ast, base_class->getType().getAsOpaquePtr());
+ return CompilerType (ast, base_class->getType().getAsOpaquePtr());
}
}
}
@@ -5244,18 +5244,18 @@ ClangASTContext::GetVirtualBaseClassAtIn
break;
case clang::Type::Typedef:
- return GetVirtualBaseClassAtIndex (ClangASTType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()), idx, bit_offset_ptr);
+ return GetVirtualBaseClassAtIndex (CompilerType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()), idx, bit_offset_ptr);
case clang::Type::Elaborated:
- return GetVirtualBaseClassAtIndex (ClangASTType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()), idx, bit_offset_ptr);
+ return GetVirtualBaseClassAtIndex (CompilerType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()), idx, bit_offset_ptr);
case clang::Type::Paren:
- return GetVirtualBaseClassAtIndex (ClangASTType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()), idx, bit_offset_ptr);
+ return GetVirtualBaseClassAtIndex (CompilerType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()), idx, bit_offset_ptr);
default:
break;
}
- return ClangASTType();
+ return CompilerType();
}
static clang_type_t
@@ -5317,7 +5317,7 @@ GetObjCFieldAtIndex (clang::ASTContext *
return nullptr;
}
-ClangASTType
+CompilerType
ClangASTContext::GetFieldAtIndex (void* type, size_t idx,
std::string& name,
uint64_t *bit_offset_ptr,
@@ -5325,7 +5325,7 @@ ClangASTContext::GetFieldAtIndex (void*
bool *is_bitfield_ptr)
{
if (!type)
- return ClangASTType();
+ return CompilerType();
clang::QualType qual_type(GetCanonicalQualType(type));
const clang::Type::TypeClass type_class = qual_type->getTypeClass();
@@ -5373,7 +5373,7 @@ ClangASTContext::GetFieldAtIndex (void*
if (is_bitfield_ptr)
*is_bitfield_ptr = is_bitfield;
- return ClangASTType (getASTContext(), field->getType());
+ return CompilerType (getASTContext(), field->getType());
}
}
}
@@ -5386,7 +5386,7 @@ ClangASTContext::GetFieldAtIndex (void*
if (objc_class_type)
{
clang::ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterfaceDecl();
- return ClangASTType (this, GetObjCFieldAtIndex(getASTContext(), class_interface_decl, idx, name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
+ return CompilerType (this, GetObjCFieldAtIndex(getASTContext(), class_interface_decl, idx, name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
}
}
break;
@@ -5400,14 +5400,14 @@ ClangASTContext::GetFieldAtIndex (void*
if (objc_class_type)
{
clang::ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterface();
- return ClangASTType (this, GetObjCFieldAtIndex(getASTContext(), class_interface_decl, idx, name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
+ return CompilerType (this, GetObjCFieldAtIndex(getASTContext(), class_interface_decl, idx, name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
}
}
break;
case clang::Type::Typedef:
- return ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).
+ return CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).
GetFieldAtIndex (idx,
name,
bit_offset_ptr,
@@ -5415,7 +5415,7 @@ ClangASTContext::GetFieldAtIndex (void*
is_bitfield_ptr);
case clang::Type::Elaborated:
- return ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).
+ return CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).
GetFieldAtIndex (idx,
name,
bit_offset_ptr,
@@ -5423,7 +5423,7 @@ ClangASTContext::GetFieldAtIndex (void*
is_bitfield_ptr);
case clang::Type::Paren:
- return ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).
+ return CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).
GetFieldAtIndex (idx,
name,
bit_offset_ptr,
@@ -5433,7 +5433,7 @@ ClangASTContext::GetFieldAtIndex (void*
default:
break;
}
- return ClangASTType();
+ return CompilerType();
}
// If a pointer to a pointee type (the clang_type arg) says that it has no
@@ -5542,7 +5542,7 @@ ClangASTContext::GetNumPointeeChildren (
}
-ClangASTType
+CompilerType
ClangASTContext::GetChildClangTypeAtIndex (void* type, ExecutionContext *exe_ctx,
size_t idx,
bool transparent_pointers,
@@ -5558,7 +5558,7 @@ ClangASTContext::GetChildClangTypeAtInde
ValueObject *valobj)
{
if (!type)
- return ClangASTType();
+ return CompilerType();
clang::QualType parent_qual_type(GetCanonicalQualType(type));
const clang::Type::TypeClass parent_type_class = parent_qual_type->getTypeClass();
@@ -5579,7 +5579,7 @@ ClangASTContext::GetChildClangTypeAtInde
case clang::BuiltinType::ObjCClass:
child_name = "isa";
child_byte_size = getASTContext()->getTypeSize(getASTContext()->ObjCBuiltinClassTy) / CHAR_BIT;
- return ClangASTType (getASTContext(), getASTContext()->ObjCBuiltinClassTy);
+ return CompilerType (getASTContext(), getASTContext()->ObjCBuiltinClassTy);
default:
break;
@@ -5695,7 +5695,7 @@ ClangASTContext::GetChildClangTypeAtInde
// Base classes should be a multiple of 8 bits in size
child_byte_offset = bit_offset/8;
- ClangASTType base_class_clang_type(getASTContext(), base_class->getType());
+ CompilerType base_class_clang_type(getASTContext(), base_class->getType());
child_name = base_class_clang_type.GetTypeName().AsCString("");
uint64_t base_class_clang_type_bit_size = base_class_clang_type.GetBitSize(exe_ctx ? exe_ctx->GetBestExecutionContextScope() : NULL);
@@ -5723,7 +5723,7 @@ ClangASTContext::GetChildClangTypeAtInde
// Figure out the type byte size (field_type_info.first) and
// alignment (field_type_info.second) from the AST context.
- ClangASTType field_clang_type (getASTContext(), field->getType());
+ CompilerType field_clang_type (getASTContext(), field->getType());
assert(field_idx < record_layout.getFieldCount());
child_byte_size = field_clang_type.GetByteSize(exe_ctx ? exe_ctx->GetBestExecutionContextScope() : NULL);
@@ -5759,7 +5759,7 @@ ClangASTContext::GetChildClangTypeAtInde
{
if (omit_empty_base_classes)
{
- ClangASTType base_class_clang_type (getASTContext(), getASTContext()->getObjCInterfaceType(superclass_interface_decl));
+ CompilerType base_class_clang_type (getASTContext(), getASTContext()->getObjCInterfaceType(superclass_interface_decl));
if (base_class_clang_type.GetNumChildren(omit_empty_base_classes) > 0)
{
if (idx == 0)
@@ -5775,7 +5775,7 @@ ClangASTContext::GetChildClangTypeAtInde
child_byte_offset = 0;
child_is_base_class = true;
- return ClangASTType (getASTContext(), ivar_qual_type);
+ return CompilerType (getASTContext(), ivar_qual_type);
}
++child_idx;
@@ -5819,7 +5819,7 @@ ClangASTContext::GetChildClangTypeAtInde
ObjCLanguageRuntime *objc_runtime = process->GetObjCLanguageRuntime();
if (objc_runtime != nullptr)
{
- ClangASTType parent_ast_type (getASTContext(), parent_qual_type);
+ CompilerType parent_ast_type (getASTContext(), parent_qual_type);
child_byte_offset = objc_runtime->GetByteOffsetForIvar (parent_ast_type, ivar_decl->getNameAsString().c_str());
}
}
@@ -5844,7 +5844,7 @@ ClangASTContext::GetChildClangTypeAtInde
child_bitfield_bit_offset = bit_offset % 8;
}
- return ClangASTType (getASTContext(), ivar_qual_type);
+ return CompilerType (getASTContext(), ivar_qual_type);
}
++child_idx;
}
@@ -5857,7 +5857,7 @@ ClangASTContext::GetChildClangTypeAtInde
case clang::Type::ObjCObjectPointer:
if (idx_is_valid)
{
- ClangASTType pointee_clang_type (GetPointeeType(type));
+ CompilerType pointee_clang_type (GetPointeeType(type));
if (transparent_pointers && pointee_clang_type.IsAggregateType())
{
@@ -5905,7 +5905,7 @@ ClangASTContext::GetChildClangTypeAtInde
const clang::VectorType *array = llvm::cast<clang::VectorType>(parent_qual_type.getTypePtr());
if (array)
{
- ClangASTType element_type (getASTContext(), array->getElementType());
+ CompilerType element_type (getASTContext(), array->getElementType());
if (element_type.GetCompleteType())
{
char element_name[64];
@@ -5926,7 +5926,7 @@ ClangASTContext::GetChildClangTypeAtInde
const clang::ArrayType *array = GetQualType(type)->getAsArrayTypeUnsafe();
if (array)
{
- ClangASTType element_type (getASTContext(), array->getElementType());
+ CompilerType element_type (getASTContext(), array->getElementType());
if (element_type.GetCompleteType())
{
char element_name[64];
@@ -5944,11 +5944,11 @@ ClangASTContext::GetChildClangTypeAtInde
case clang::Type::Pointer:
if (idx_is_valid)
{
- ClangASTType pointee_clang_type (GetPointeeType(type));
+ CompilerType pointee_clang_type (GetPointeeType(type));
// Don't dereference "void *" pointers
if (pointee_clang_type.IsVoidType())
- return ClangASTType();
+ return CompilerType();
if (transparent_pointers && pointee_clang_type.IsAggregateType ())
{
@@ -5995,7 +5995,7 @@ ClangASTContext::GetChildClangTypeAtInde
if (idx_is_valid)
{
const clang::ReferenceType *reference_type = llvm::cast<clang::ReferenceType>(parent_qual_type.getTypePtr());
- ClangASTType pointee_clang_type (getASTContext(), reference_type->getPointeeType());
+ CompilerType pointee_clang_type (getASTContext(), reference_type->getPointeeType());
if (transparent_pointers && pointee_clang_type.IsAggregateType ())
{
child_is_deref_of_parent = false;
@@ -6036,7 +6036,7 @@ ClangASTContext::GetChildClangTypeAtInde
case clang::Type::Typedef:
{
- ClangASTType typedefed_clang_type (getASTContext(), llvm::cast<clang::TypedefType>(parent_qual_type)->getDecl()->getUnderlyingType());
+ CompilerType typedefed_clang_type (getASTContext(), llvm::cast<clang::TypedefType>(parent_qual_type)->getDecl()->getUnderlyingType());
return typedefed_clang_type.GetChildClangTypeAtIndex (exe_ctx,
idx,
transparent_pointers,
@@ -6055,7 +6055,7 @@ ClangASTContext::GetChildClangTypeAtInde
case clang::Type::Elaborated:
{
- ClangASTType elaborated_clang_type (getASTContext(), llvm::cast<clang::ElaboratedType>(parent_qual_type)->getNamedType());
+ CompilerType elaborated_clang_type (getASTContext(), llvm::cast<clang::ElaboratedType>(parent_qual_type)->getNamedType());
return elaborated_clang_type.GetChildClangTypeAtIndex (exe_ctx,
idx,
transparent_pointers,
@@ -6073,7 +6073,7 @@ ClangASTContext::GetChildClangTypeAtInde
case clang::Type::Paren:
{
- ClangASTType paren_clang_type (getASTContext(), llvm::cast<clang::ParenType>(parent_qual_type)->desugar());
+ CompilerType paren_clang_type (getASTContext(), llvm::cast<clang::ParenType>(parent_qual_type)->desugar());
return paren_clang_type.GetChildClangTypeAtIndex (exe_ctx,
idx,
transparent_pointers,
@@ -6093,7 +6093,7 @@ ClangASTContext::GetChildClangTypeAtInde
default:
break;
}
- return ClangASTType();
+ return CompilerType();
}
static uint32_t
@@ -6226,7 +6226,7 @@ ClangASTContext::GetIndexOfChildMemberWi
llvm::StringRef field_name = field->getName();
if (field_name.empty())
{
- ClangASTType field_type(getASTContext(),field->getType());
+ CompilerType field_type(getASTContext(),field->getType());
child_indexes.push_back(child_idx);
if (field_type.GetIndexOfChildMemberWithName(name, omit_empty_base_classes, child_indexes))
return child_indexes.size();
@@ -6338,7 +6338,7 @@ ClangASTContext::GetIndexOfChildMemberWi
// an ivar in our superclass...
child_indexes.push_back (0);
- ClangASTType superclass_clang_type (getASTContext(), getASTContext()->getObjCInterfaceType(superclass_interface_decl));
+ CompilerType superclass_clang_type (getASTContext(), getASTContext()->getObjCInterfaceType(superclass_interface_decl));
if (superclass_clang_type.GetIndexOfChildMemberWithName (name,
omit_empty_base_classes,
child_indexes))
@@ -6360,7 +6360,7 @@ ClangASTContext::GetIndexOfChildMemberWi
case clang::Type::ObjCObjectPointer:
{
- ClangASTType objc_object_clang_type (getASTContext(), llvm::cast<clang::ObjCObjectPointerType>(qual_type.getTypePtr())->getPointeeType());
+ CompilerType objc_object_clang_type (getASTContext(), llvm::cast<clang::ObjCObjectPointerType>(qual_type.getTypePtr())->getPointeeType());
return objc_object_clang_type.GetIndexOfChildMemberWithName (name,
omit_empty_base_classes,
child_indexes);
@@ -6408,7 +6408,7 @@ ClangASTContext::GetIndexOfChildMemberWi
{
const clang::ReferenceType *reference_type = llvm::cast<clang::ReferenceType>(qual_type.getTypePtr());
clang::QualType pointee_type(reference_type->getPointeeType());
- ClangASTType pointee_clang_type (getASTContext(), pointee_type);
+ CompilerType pointee_clang_type (getASTContext(), pointee_type);
if (pointee_clang_type.IsAggregateType ())
{
@@ -6421,7 +6421,7 @@ ClangASTContext::GetIndexOfChildMemberWi
case clang::Type::Pointer:
{
- ClangASTType pointee_clang_type (GetPointeeType(type));
+ CompilerType pointee_clang_type (GetPointeeType(type));
if (pointee_clang_type.IsAggregateType ())
{
@@ -6433,17 +6433,17 @@ ClangASTContext::GetIndexOfChildMemberWi
break;
case clang::Type::Typedef:
- return ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetIndexOfChildMemberWithName (name,
+ return CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetIndexOfChildMemberWithName (name,
omit_empty_base_classes,
child_indexes);
case clang::Type::Elaborated:
- return ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetIndexOfChildMemberWithName (name,
+ return CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetIndexOfChildMemberWithName (name,
omit_empty_base_classes,
child_indexes);
case clang::Type::Paren:
- return ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetIndexOfChildMemberWithName (name,
+ return CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetIndexOfChildMemberWithName (name,
omit_empty_base_classes,
child_indexes);
@@ -6493,7 +6493,7 @@ ClangASTContext::GetIndexOfChildWithName
if (omit_empty_base_classes && ClangASTContext::RecordHasFields(base_class_decl) == false)
continue;
- ClangASTType base_class_clang_type (getASTContext(), base_class->getType());
+ CompilerType base_class_clang_type (getASTContext(), base_class->getType());
std::string base_class_type_name (base_class_clang_type.GetTypeName().AsCString(""));
if (base_class_type_name.compare (name) == 0)
return child_idx;
@@ -6558,7 +6558,7 @@ ClangASTContext::GetIndexOfChildWithName
case clang::Type::ObjCObjectPointer:
{
- ClangASTType pointee_clang_type (getASTContext(), llvm::cast<clang::ObjCObjectPointerType>(qual_type.getTypePtr())->getPointeeType());
+ CompilerType pointee_clang_type (getASTContext(), llvm::cast<clang::ObjCObjectPointerType>(qual_type.getTypePtr())->getPointeeType());
return pointee_clang_type.GetIndexOfChildWithName (name, omit_empty_base_classes);
}
break;
@@ -6602,7 +6602,7 @@ ClangASTContext::GetIndexOfChildWithName
case clang::Type::RValueReference:
{
const clang::ReferenceType *reference_type = llvm::cast<clang::ReferenceType>(qual_type.getTypePtr());
- ClangASTType pointee_type (getASTContext(), reference_type->getPointeeType());
+ CompilerType pointee_type (getASTContext(), reference_type->getPointeeType());
if (pointee_type.IsAggregateType ())
{
@@ -6614,7 +6614,7 @@ ClangASTContext::GetIndexOfChildWithName
case clang::Type::Pointer:
{
const clang::PointerType *pointer_type = llvm::cast<clang::PointerType>(qual_type.getTypePtr());
- ClangASTType pointee_type (getASTContext(), pointer_type->getPointeeType());
+ CompilerType pointee_type (getASTContext(), pointer_type->getPointeeType());
if (pointee_type.IsAggregateType ())
{
@@ -6642,13 +6642,13 @@ ClangASTContext::GetIndexOfChildWithName
break;
case clang::Type::Elaborated:
- return ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetIndexOfChildWithName (name, omit_empty_base_classes);
+ return CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).GetIndexOfChildWithName (name, omit_empty_base_classes);
case clang::Type::Paren:
- return ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetIndexOfChildWithName (name, omit_empty_base_classes);
+ return CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).GetIndexOfChildWithName (name, omit_empty_base_classes);
case clang::Type::Typedef:
- return ClangASTType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetIndexOfChildWithName (name, omit_empty_base_classes);
+ return CompilerType (getASTContext(), llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType()).GetIndexOfChildWithName (name, omit_empty_base_classes);
default:
break;
@@ -6659,7 +6659,7 @@ ClangASTContext::GetIndexOfChildWithName
size_t
-ClangASTContext::GetNumTemplateArguments (const ClangASTType& type)
+ClangASTContext::GetNumTemplateArguments (const CompilerType& type)
{
if (!type)
return 0;
@@ -6685,13 +6685,13 @@ ClangASTContext::GetNumTemplateArguments
break;
case clang::Type::Typedef:
- return GetNumTemplateArguments(ClangASTType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()));
+ return GetNumTemplateArguments(CompilerType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()));
case clang::Type::Elaborated:
- return GetNumTemplateArguments(ClangASTType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()));
+ return GetNumTemplateArguments(CompilerType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()));
case clang::Type::Paren:
- return GetNumTemplateArguments(ClangASTType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()));
+ return GetNumTemplateArguments(CompilerType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()));
default:
break;
@@ -6700,11 +6700,11 @@ ClangASTContext::GetNumTemplateArguments
return 0;
}
-ClangASTType
-ClangASTContext::GetTemplateArgument (const ClangASTType& type, size_t arg_idx, lldb::TemplateArgumentKind &kind)
+CompilerType
+ClangASTContext::GetTemplateArgument (const CompilerType& type, size_t arg_idx, lldb::TemplateArgumentKind &kind)
{
if (!type)
- return ClangASTType();
+ return CompilerType();
ClangASTContext* ast = type.GetTypeSystem()->AsClangASTContext();
if (ast)
{
@@ -6727,35 +6727,35 @@ ClangASTContext::GetTemplateArgument (co
{
case clang::TemplateArgument::Null:
kind = eTemplateArgumentKindNull;
- return ClangASTType();
+ return CompilerType();
case clang::TemplateArgument::Type:
kind = eTemplateArgumentKindType;
- return ClangASTType(ast, template_arg.getAsType().getAsOpaquePtr());
+ return CompilerType(ast, template_arg.getAsType().getAsOpaquePtr());
case clang::TemplateArgument::Declaration:
kind = eTemplateArgumentKindDeclaration;
- return ClangASTType();
+ return CompilerType();
case clang::TemplateArgument::Integral:
kind = eTemplateArgumentKindIntegral;
- return ClangASTType(ast, template_arg.getIntegralType().getAsOpaquePtr());
+ return CompilerType(ast, template_arg.getIntegralType().getAsOpaquePtr());
case clang::TemplateArgument::Template:
kind = eTemplateArgumentKindTemplate;
- return ClangASTType();
+ return CompilerType();
case clang::TemplateArgument::TemplateExpansion:
kind = eTemplateArgumentKindTemplateExpansion;
- return ClangASTType();
+ return CompilerType();
case clang::TemplateArgument::Expression:
kind = eTemplateArgumentKindExpression;
- return ClangASTType();
+ return CompilerType();
case clang::TemplateArgument::Pack:
kind = eTemplateArgumentKindPack;
- return ClangASTType();
+ return CompilerType();
default:
assert (!"Unhandled clang::TemplateArgument::ArgKind");
@@ -6767,20 +6767,20 @@ ClangASTContext::GetTemplateArgument (co
break;
case clang::Type::Typedef:
- return GetTemplateArgument(ClangASTType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()), arg_idx, kind);
+ return GetTemplateArgument(CompilerType (ast, llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()), arg_idx, kind);
case clang::Type::Elaborated:
- return GetTemplateArgument(ClangASTType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()), arg_idx, kind);
+ return GetTemplateArgument(CompilerType (ast, llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr()), arg_idx, kind);
case clang::Type::Paren:
- return GetTemplateArgument(ClangASTType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()), arg_idx, kind);
+ return GetTemplateArgument(CompilerType (ast, llvm::cast<clang::ParenType>(qual_type)->desugar().getAsOpaquePtr()), arg_idx, kind);
default:
break;
}
}
kind = eTemplateArgumentKindNull;
- return ClangASTType ();
+ return CompilerType ();
}
static bool
@@ -7000,7 +7000,7 @@ IsOperator (const char *name, clang::Ove
}
clang::EnumDecl *
-ClangASTContext::GetAsEnumDecl (const ClangASTType& type)
+ClangASTContext::GetAsEnumDecl (const CompilerType& type)
{
const clang::EnumType *enutype = llvm::dyn_cast<clang::EnumType>(GetCanonicalQualType(type));
if (enutype)
@@ -7009,7 +7009,7 @@ ClangASTContext::GetAsEnumDecl (const Cl
}
clang::RecordDecl *
-ClangASTContext::GetAsRecordDecl (const ClangASTType& type)
+ClangASTContext::GetAsRecordDecl (const CompilerType& type)
{
const clang::RecordType *record_type = llvm::dyn_cast<clang::RecordType>(GetCanonicalQualType(type));
if (record_type)
@@ -7024,7 +7024,7 @@ ClangASTContext::GetAsCXXRecordDecl (voi
}
clang::ObjCInterfaceDecl *
-ClangASTContext::GetAsObjCInterfaceDecl (const ClangASTType& type)
+ClangASTContext::GetAsObjCInterfaceDecl (const CompilerType& type)
{
const clang::ObjCObjectType *objc_class_type = llvm::dyn_cast<clang::ObjCObjectType>(GetCanonicalQualType(type));
if (objc_class_type)
@@ -7033,8 +7033,8 @@ ClangASTContext::GetAsObjCInterfaceDecl
}
clang::FieldDecl *
-ClangASTContext::AddFieldToRecordType (const ClangASTType& type, const char *name,
- const ClangASTType &field_clang_type,
+ClangASTContext::AddFieldToRecordType (const CompilerType& type, const char *name,
+ const CompilerType &field_clang_type,
AccessType access,
uint32_t bitfield_bit_size)
{
@@ -7128,7 +7128,7 @@ ClangASTContext::AddFieldToRecordType (c
}
void
-ClangASTContext::BuildIndirectFields (const ClangASTType& type)
+ClangASTContext::BuildIndirectFields (const CompilerType& type)
{
ClangASTContext* ast = nullptr;
if (type)
@@ -7239,7 +7239,7 @@ ClangASTContext::BuildIndirectFields (co
}
void
-ClangASTContext::SetIsPacked (const ClangASTType& type)
+ClangASTContext::SetIsPacked (const CompilerType& type)
{
clang::RecordDecl *record_decl = GetAsRecordDecl(type);
@@ -7250,8 +7250,8 @@ ClangASTContext::SetIsPacked (const Clan
}
clang::VarDecl *
-ClangASTContext::AddVariableToRecordType (const ClangASTType& type, const char *name,
- const ClangASTType &var_type,
+ClangASTContext::AddVariableToRecordType (const CompilerType& type, const char *name,
+ const CompilerType &var_type,
AccessType access)
{
clang::VarDecl *var_decl = nullptr;
@@ -7289,7 +7289,7 @@ ClangASTContext::AddVariableToRecordType
clang::CXXMethodDecl *
ClangASTContext::AddMethodToCXXRecordType (void* type, const char *name,
- const ClangASTType &method_clang_type,
+ const CompilerType &method_clang_type,
lldb::AccessType access,
bool is_virtual,
bool is_static,
@@ -7539,7 +7539,7 @@ ClangASTContext::SetBaseClassesForClassT
}
bool
-ClangASTContext::SetObjCSuperClass (const ClangASTType& type, const ClangASTType &superclass_clang_type)
+ClangASTContext::SetObjCSuperClass (const CompilerType& type, const CompilerType &superclass_clang_type)
{
ClangASTContext* ast = type.GetTypeSystem()->AsClangASTContext();
if (!ast)
@@ -7560,9 +7560,9 @@ ClangASTContext::SetObjCSuperClass (cons
}
bool
-ClangASTContext::AddObjCClassProperty (const ClangASTType& type,
+ClangASTContext::AddObjCClassProperty (const CompilerType& type,
const char *property_name,
- const ClangASTType &property_clang_type,
+ const CompilerType &property_clang_type,
clang::ObjCIvarDecl *ivar_decl,
const char *property_setter_name,
const char *property_getter_name,
@@ -7580,12 +7580,12 @@ ClangASTContext::AddObjCClassProperty (c
if (class_interface_decl)
{
- ClangASTType property_clang_type_to_access;
+ CompilerType property_clang_type_to_access;
if (property_clang_type.IsValid())
property_clang_type_to_access = property_clang_type;
else if (ivar_decl)
- property_clang_type_to_access = ClangASTType (clang_ast, ivar_decl->getType());
+ property_clang_type_to_access = CompilerType (clang_ast, ivar_decl->getType());
if (class_interface_decl && property_clang_type_to_access.IsValid())
{
@@ -7753,7 +7753,7 @@ ClangASTContext::AddObjCClassProperty (c
}
bool
-ClangASTContext::IsObjCClassTypeAndHasIVars (const ClangASTType& type, bool check_superclass)
+ClangASTContext::IsObjCClassTypeAndHasIVars (const CompilerType& type, bool check_superclass)
{
clang::ObjCInterfaceDecl *class_interface_decl = GetAsObjCInterfaceDecl (type);
if (class_interface_decl)
@@ -7763,9 +7763,9 @@ ClangASTContext::IsObjCClassTypeAndHasIV
clang::ObjCMethodDecl *
-ClangASTContext::AddMethodToObjCObjectType (const ClangASTType& type,
+ClangASTContext::AddMethodToObjCObjectType (const CompilerType& type,
const char *name, // the full symbol name as seen in the symbol table (void* type, "-[NString stringWithCString:]")
- const ClangASTType &method_clang_type,
+ const CompilerType &method_clang_type,
lldb::AccessType access,
bool is_artificial)
{
@@ -7955,7 +7955,7 @@ ClangASTContext::SetHasExternalStorage (
#pragma mark TagDecl
bool
-ClangASTContext::StartTagDeclarationDefinition (const ClangASTType &type)
+ClangASTContext::StartTagDeclarationDefinition (const CompilerType &type)
{
if (type)
{
@@ -7991,7 +7991,7 @@ ClangASTContext::StartTagDeclarationDefi
}
bool
-ClangASTContext::CompleteTagDeclarationDefinition (const ClangASTType& type)
+ClangASTContext::CompleteTagDeclarationDefinition (const CompilerType& type)
{
if (type)
{
@@ -8050,7 +8050,7 @@ ClangASTContext::CompleteTagDeclarationD
bool
-ClangASTContext::AddEnumerationValueToEnumerationType (void* type, const ClangASTType &enumerator_clang_type,
+ClangASTContext::AddEnumerationValueToEnumerationType (void* type, const CompilerType &enumerator_clang_type,
const Declaration &decl,
const char *name,
int64_t enum_value,
@@ -8097,7 +8097,7 @@ ClangASTContext::AddEnumerationValueToEn
}
-ClangASTType
+CompilerType
ClangASTContext::GetEnumerationIntegerType (void* type)
{
clang::QualType enum_qual_type (GetCanonicalQualType(type));
@@ -8109,25 +8109,25 @@ ClangASTContext::GetEnumerationIntegerTy
{
clang::EnumDecl *enum_decl = enutype->getDecl();
if (enum_decl)
- return ClangASTType (getASTContext(), enum_decl->getIntegerType());
+ return CompilerType (getASTContext(), enum_decl->getIntegerType());
}
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTContext::CreateMemberPointerType (const ClangASTType& type, const ClangASTType &pointee_type)
+CompilerType
+ClangASTContext::CreateMemberPointerType (const CompilerType& type, const CompilerType &pointee_type)
{
if (type && pointee_type.IsValid() && type.GetTypeSystem() == pointee_type.GetTypeSystem())
{
ClangASTContext* ast = type.GetTypeSystem()->AsClangASTContext();
if (!ast)
- return ClangASTType();
- return ClangASTType (ast->getASTContext(),
+ return CompilerType();
+ return CompilerType (ast->getASTContext(),
ast->getASTContext()->getMemberPointerType (GetQualType(pointee_type),
GetQualType(type).getTypePtr()));
}
- return ClangASTType();
+ return CompilerType();
}
@@ -8243,7 +8243,7 @@ ClangASTContext::DumpValue (void* type,
clang::TypeInfo base_class_type_info = getASTContext()->getTypeInfo(base_class_qual_type);
// Dump the value of the member
- ClangASTType base_clang_type(getASTContext(), base_class_qual_type);
+ CompilerType base_clang_type(getASTContext(), base_class_qual_type);
base_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
base_clang_type.GetFormat(), // The format with which to display the member
@@ -8302,7 +8302,7 @@ ClangASTContext::DumpValue (void* type,
// Dump the value of the member
- ClangASTType field_clang_type (getASTContext(), field_type);
+ CompilerType field_clang_type (getASTContext(), field_type);
field_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
field_clang_type.GetFormat(), // The format with which to display the member
@@ -8374,7 +8374,7 @@ ClangASTContext::DumpValue (void* type,
}
else
{
- ClangASTType element_clang_type(getASTContext(), element_qual_type);
+ CompilerType element_clang_type(getASTContext(), element_qual_type);
lldb::Format element_format = element_clang_type.GetFormat();
for (element_idx = 0; element_idx < element_count; ++element_idx)
@@ -8419,7 +8419,7 @@ ClangASTContext::DumpValue (void* type,
{
clang::QualType typedef_qual_type = llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType();
- ClangASTType typedef_clang_type (getASTContext(), typedef_qual_type);
+ CompilerType typedef_clang_type (getASTContext(), typedef_qual_type);
lldb::Format typedef_format = typedef_clang_type.GetFormat();
clang::TypeInfo typedef_type_info = getASTContext()->getTypeInfo(typedef_qual_type);
uint64_t typedef_byte_size = typedef_type_info.Width / 8;
@@ -8442,7 +8442,7 @@ ClangASTContext::DumpValue (void* type,
case clang::Type::Elaborated:
{
clang::QualType elaborated_qual_type = llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType();
- ClangASTType elaborated_clang_type (getASTContext(), elaborated_qual_type);
+ CompilerType elaborated_clang_type (getASTContext(), elaborated_qual_type);
lldb::Format elaborated_format = elaborated_clang_type.GetFormat();
clang::TypeInfo elaborated_type_info = getASTContext()->getTypeInfo(elaborated_qual_type);
uint64_t elaborated_byte_size = elaborated_type_info.Width / 8;
@@ -8465,7 +8465,7 @@ ClangASTContext::DumpValue (void* type,
case clang::Type::Paren:
{
clang::QualType desugar_qual_type = llvm::cast<clang::ParenType>(qual_type)->desugar();
- ClangASTType desugar_clang_type (getASTContext(), desugar_qual_type);
+ CompilerType desugar_clang_type (getASTContext(), desugar_qual_type);
lldb::Format desugar_format = desugar_clang_type.GetFormat();
clang::TypeInfo desugar_type_info = getASTContext()->getTypeInfo(desugar_qual_type);
@@ -8533,7 +8533,7 @@ ClangASTContext::DumpTypeValue (void* ty
case clang::Type::Typedef:
{
clang::QualType typedef_qual_type = llvm::cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType();
- ClangASTType typedef_clang_type (getASTContext(), typedef_qual_type);
+ CompilerType typedef_clang_type (getASTContext(), typedef_qual_type);
if (format == eFormatDefault)
format = typedef_clang_type.GetFormat();
clang::TypeInfo typedef_type_info = getASTContext()->getTypeInfo(typedef_qual_type);
@@ -8778,11 +8778,11 @@ ClangASTContext::DumpTypeDescription (vo
break;
case clang::Type::Elaborated:
- ClangASTType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).DumpTypeDescription(s);
+ CompilerType (getASTContext(), llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType()).DumpTypeDescription(s);
return;
case clang::Type::Paren:
- ClangASTType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).DumpTypeDescription(s);
+ CompilerType (getASTContext(), llvm::cast<clang::ParenType>(qual_type)->desugar()).DumpTypeDescription(s);
return;
case clang::Type::Record:
Removed: lldb/trunk/source/Symbol/ClangASTType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTType.cpp?rev=244688&view=auto
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTType.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTType.cpp (removed)
@@ -1,1196 +0,0 @@
-//===-- ClangASTType.cpp ----------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Symbol/ClangASTType.h"
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Attr.h"
-#include "clang/AST/CXXInheritance.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclObjC.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/RecordLayout.h"
-#include "clang/AST/Type.h"
-#include "clang/AST/VTableBuilder.h"
-
-#include "clang/Basic/Builtins.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-
-#include "llvm/Support/Format.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/FormattedStream.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "lldb/Core/ConstString.h"
-#include "lldb/Core/DataBufferHeap.h"
-#include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Scalar.h"
-#include "lldb/Core/Stream.h"
-#include "lldb/Core/StreamFile.h"
-#include "lldb/Core/StreamString.h"
-#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/ClangExternalASTSourceCommon.h"
-#include "lldb/Symbol/Type.h"
-#include "lldb/Symbol/VerifyDecl.h"
-#include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ObjCLanguageRuntime.h"
-#include "lldb/Target/Process.h"
-
-#include <iterator>
-#include <mutex>
-
-using namespace lldb;
-using namespace lldb_private;
-
-ClangASTType::ClangASTType (TypeSystem *type_system,
- void* type) :
- m_type (type),
- m_type_system (type_system)
-{
-}
-
-ClangASTType::ClangASTType (clang::ASTContext *ast,
- clang::QualType qual_type) :
- m_type (qual_type.getAsOpaquePtr()),
- m_type_system (ClangASTContext::GetASTContext(ast))
-{
-}
-
-ClangASTType::~ClangASTType()
-{
-}
-
-//----------------------------------------------------------------------
-// Tests
-//----------------------------------------------------------------------
-
-bool
-ClangASTType::IsAggregateType () const
-{
- if (IsValid())
- return m_type_system->IsAggregateType(m_type);
- return false;
-}
-
-bool
-ClangASTType::IsArrayType (ClangASTType *element_type_ptr,
- uint64_t *size,
- bool *is_incomplete) const
-{
- if (IsValid())
- return m_type_system->IsArrayType(m_type, element_type_ptr, size, is_incomplete);
-
- if (element_type_ptr)
- element_type_ptr->Clear();
- if (size)
- *size = 0;
- if (is_incomplete)
- *is_incomplete = false;
- return 0;
-}
-
-bool
-ClangASTType::IsVectorType (ClangASTType *element_type,
- uint64_t *size) const
-{
- if (IsValid())
- return m_type_system->IsVectorType(m_type, element_type, size);
- return false;
-}
-
-bool
-ClangASTType::IsRuntimeGeneratedType () const
-{
- if (IsValid())
- return m_type_system->IsRuntimeGeneratedType(m_type);
- return false;
-}
-
-bool
-ClangASTType::IsCharType () const
-{
- if (IsValid())
- return m_type_system->IsCharType(m_type);
- return false;
-}
-
-
-bool
-ClangASTType::IsCompleteType () const
-{
- if (IsValid())
- return m_type_system->IsCompleteType(m_type);
- return false;
-}
-
-bool
-ClangASTType::IsConst() const
-{
- if (IsValid())
- return m_type_system->IsConst(m_type);
- return false;
-}
-
-bool
-ClangASTType::IsCStringType (uint32_t &length) const
-{
- if (IsValid())
- return m_type_system->IsCStringType(m_type, length);
- return false;
-}
-
-bool
-ClangASTType::IsFunctionType (bool *is_variadic_ptr) const
-{
- if (IsValid())
- return m_type_system->IsFunctionType(m_type, is_variadic_ptr);
- return false;
-}
-
-// Used to detect "Homogeneous Floating-point Aggregates"
-uint32_t
-ClangASTType::IsHomogeneousAggregate (ClangASTType* base_type_ptr) const
-{
- if (IsValid())
- return m_type_system->IsHomogeneousAggregate(m_type, base_type_ptr);
- return 0;
-}
-
-size_t
-ClangASTType::GetNumberOfFunctionArguments () const
-{
- if (IsValid())
- return m_type_system->GetNumberOfFunctionArguments(m_type);
- return 0;
-}
-
-ClangASTType
-ClangASTType::GetFunctionArgumentAtIndex (const size_t index) const
-{
- if (IsValid())
- return m_type_system->GetFunctionArgumentAtIndex(m_type, index);
- return ClangASTType();
-}
-
-bool
-ClangASTType::IsFunctionPointerType () const
-{
- if (IsValid())
- return m_type_system->IsFunctionPointerType(m_type);
- return false;
-
-}
-
-bool
-ClangASTType::IsIntegerType (bool &is_signed) const
-{
- if (IsValid())
- return m_type_system->IsIntegerType(m_type, is_signed);
- return false;
-}
-
-bool
-ClangASTType::IsPointerType (ClangASTType *pointee_type) const
-{
- if (IsValid())
- {
- return m_type_system->IsPointerType(m_type, pointee_type);
- }
- if (pointee_type)
- pointee_type->Clear();
- return false;
-}
-
-
-bool
-ClangASTType::IsPointerOrReferenceType (ClangASTType *pointee_type) const
-{
- if (IsValid())
- {
- return m_type_system->IsPointerOrReferenceType(m_type, pointee_type);
- }
- if (pointee_type)
- pointee_type->Clear();
- return false;
-}
-
-
-bool
-ClangASTType::IsReferenceType (ClangASTType *pointee_type, bool* is_rvalue) const
-{
- if (IsValid())
- {
- return m_type_system->IsReferenceType(m_type, pointee_type, is_rvalue);
- }
- if (pointee_type)
- pointee_type->Clear();
- return false;
-}
-
-bool
-ClangASTType::IsFloatingPointType (uint32_t &count, bool &is_complex) const
-{
- if (IsValid())
- {
- return m_type_system->IsFloatingPointType(m_type, count, is_complex);
- }
- count = 0;
- is_complex = false;
- return false;
-}
-
-
-bool
-ClangASTType::IsDefined() const
-{
- if (IsValid())
- return m_type_system->IsDefined(m_type);
- return true;
-}
-
-bool
-ClangASTType::IsPolymorphicClass () const
-{
- if (IsValid())
- {
- return m_type_system->IsPolymorphicClass(m_type);
- }
- return false;
-}
-
-bool
-ClangASTType::IsPossibleDynamicType (ClangASTType *dynamic_pointee_type,
- bool check_cplusplus,
- bool check_objc) const
-{
- if (IsValid())
- return m_type_system->IsPossibleDynamicType(m_type, dynamic_pointee_type, check_cplusplus, check_objc);
- return false;
-}
-
-
-bool
-ClangASTType::IsScalarType () const
-{
- if (!IsValid())
- return false;
-
- return m_type_system->IsScalarType(m_type);
-}
-
-bool
-ClangASTType::IsTypedefType () const
-{
- if (!IsValid())
- return false;
- return m_type_system->IsTypedefType(m_type);
-}
-
-bool
-ClangASTType::IsVoidType () const
-{
- if (!IsValid())
- return false;
- return m_type_system->IsVoidType(m_type);
-}
-
-bool
-ClangASTType::IsPointerToScalarType () const
-{
- if (!IsValid())
- return false;
-
- return IsPointerType() && GetPointeeType().IsScalarType();
-}
-
-bool
-ClangASTType::IsArrayOfScalarType () const
-{
- ClangASTType element_type;
- if (IsArrayType(&element_type, nullptr, nullptr))
- return element_type.IsScalarType();
- return false;
-}
-
-bool
-ClangASTType::IsBeingDefined () const
-{
- if (!IsValid())
- return false;
- return m_type_system->IsBeingDefined(m_type);
-}
-
-//----------------------------------------------------------------------
-// Type Completion
-//----------------------------------------------------------------------
-
-bool
-ClangASTType::GetCompleteType () const
-{
- if (!IsValid())
- return false;
- return m_type_system->GetCompleteType(m_type);
-}
-
-//----------------------------------------------------------------------
-// AST related queries
-//----------------------------------------------------------------------
-size_t
-ClangASTType::GetPointerByteSize () const
-{
- if (m_type_system)
- return m_type_system->GetPointerByteSize();
- return 0;
-}
-
-ConstString
-ClangASTType::GetConstQualifiedTypeName () const
-{
- return GetConstTypeName ();
-}
-
-ConstString
-ClangASTType::GetConstTypeName () const
-{
- if (IsValid())
- {
- ConstString type_name (GetTypeName());
- if (type_name)
- return type_name;
- }
- return ConstString("<invalid>");
-}
-
-ConstString
-ClangASTType::GetTypeName () const
-{
- if (IsValid())
- {
- return m_type_system->GetTypeName(m_type);
- }
- return ConstString("<invalid>");
-}
-
-ConstString
-ClangASTType::GetDisplayTypeName () const
-{
- return GetTypeName();
-}
-
-uint32_t
-ClangASTType::GetTypeInfo (ClangASTType *pointee_or_element_clang_type) const
-{
- if (!IsValid())
- return 0;
-
- return m_type_system->GetTypeInfo(m_type, pointee_or_element_clang_type);
-}
-
-
-
-lldb::LanguageType
-ClangASTType::GetMinimumLanguage ()
-{
- if (!IsValid())
- return lldb::eLanguageTypeC;
-
- return m_type_system->GetMinimumLanguage(m_type);
-}
-
-lldb::TypeClass
-ClangASTType::GetTypeClass () const
-{
- if (!IsValid())
- return lldb::eTypeClassInvalid;
-
- return m_type_system->GetTypeClass(m_type);
-
-}
-
-void
-ClangASTType::SetClangType (TypeSystem* type_system, void* type)
-{
- m_type_system = type_system;
- m_type = type;
-}
-
-void
-ClangASTType::SetClangType (clang::ASTContext *ast, clang::QualType qual_type)
-{
- m_type_system = ClangASTContext::GetASTContext(ast);
- m_type = qual_type.getAsOpaquePtr();
-}
-
-unsigned
-ClangASTType::GetTypeQualifiers() const
-{
- if (IsValid())
- return m_type_system->GetTypeQualifiers(m_type);
- return 0;
-}
-
-//----------------------------------------------------------------------
-// Creating related types
-//----------------------------------------------------------------------
-
-ClangASTType
-ClangASTType::GetArrayElementType (uint64_t *stride) const
-{
- if (IsValid())
- {
- return m_type_system->GetArrayElementType(m_type, stride);
-
- }
- return ClangASTType();
-}
-
-ClangASTType
-ClangASTType::GetCanonicalType () const
-{
- if (IsValid())
- return m_type_system->GetCanonicalType(m_type);
- return ClangASTType();
-}
-
-ClangASTType
-ClangASTType::GetFullyUnqualifiedType () const
-{
- if (IsValid())
- return m_type_system->GetFullyUnqualifiedType(m_type);
- return ClangASTType();
-}
-
-
-int
-ClangASTType::GetFunctionArgumentCount () const
-{
- if (IsValid())
- {
- return m_type_system->GetFunctionArgumentCount(m_type);
- }
- return -1;
-}
-
-ClangASTType
-ClangASTType::GetFunctionArgumentTypeAtIndex (size_t idx) const
-{
- if (IsValid())
- {
- return m_type_system->GetFunctionArgumentTypeAtIndex(m_type, idx);
- }
- return ClangASTType();
-}
-
-ClangASTType
-ClangASTType::GetFunctionReturnType () const
-{
- if (IsValid())
- {
- return m_type_system->GetFunctionReturnType(m_type);
- }
- return ClangASTType();
-}
-
-size_t
-ClangASTType::GetNumMemberFunctions () const
-{
- if (IsValid())
- {
- return m_type_system->GetNumMemberFunctions(m_type);
- }
- return 0;
-}
-
-TypeMemberFunctionImpl
-ClangASTType::GetMemberFunctionAtIndex (size_t idx)
-{
- if (IsValid())
- {
- return m_type_system->GetMemberFunctionAtIndex(m_type, idx);
- }
- return TypeMemberFunctionImpl();
-}
-
-ClangASTType
-ClangASTType::GetNonReferenceType () const
-{
- if (IsValid())
- return m_type_system->GetNonReferenceType(m_type);
- return ClangASTType();
-}
-
-ClangASTType
-ClangASTType::GetPointeeType () const
-{
- if (IsValid())
- {
- return m_type_system->GetPointeeType(m_type);
- }
- return ClangASTType();
-}
-
-ClangASTType
-ClangASTType::GetPointerType () const
-{
- if (IsValid())
- {
- return m_type_system->GetPointerType(m_type);
- }
- return ClangASTType();
-}
-
-ClangASTType
-ClangASTType::GetTypedefedType () const
-{
- if (IsValid())
- return m_type_system->GetTypedefedType(m_type);
- return ClangASTType();
-}
-
-//ClangASTType
-//ClangASTType::RemoveFastQualifiers () const
-//{
-// if (IsValid())
-// return m_type_system->RemoveFastQualifiers(m_type);
-// return ClangASTType();
-//}
-
-
-//----------------------------------------------------------------------
-// Create related types using the current type's AST
-//----------------------------------------------------------------------
-
-ClangASTType
-ClangASTType::GetBasicTypeFromAST (lldb::BasicType basic_type) const
-{
- if (IsValid())
- return m_type_system->GetBasicTypeFromAST(m_type, basic_type);
- return ClangASTType();
-}
-//----------------------------------------------------------------------
-// Exploring the type
-//----------------------------------------------------------------------
-
-uint64_t
-ClangASTType::GetBitSize (ExecutionContextScope *exe_scope) const
-{
- if (IsValid())
- {
- return m_type_system->GetBitSize(m_type, exe_scope);
- }
- return 0;
-}
-
-uint64_t
-ClangASTType::GetByteSize (ExecutionContextScope *exe_scope) const
-{
- return (GetBitSize (exe_scope) + 7) / 8;
-}
-
-
-size_t
-ClangASTType::GetTypeBitAlign () const
-{
- if (IsValid())
- return m_type_system->GetTypeBitAlign(m_type);
- return 0;
-}
-
-
-lldb::Encoding
-ClangASTType::GetEncoding (uint64_t &count) const
-{
- if (!IsValid())
- return lldb::eEncodingInvalid;
-
- return m_type_system->GetEncoding(m_type, count);
-}
-
-lldb::Format
-ClangASTType::GetFormat () const
-{
- if (!IsValid())
- return lldb::eFormatDefault;
-
- return m_type_system->GetFormat(m_type);
-}
-
-uint32_t
-ClangASTType::GetNumChildren (bool omit_empty_base_classes) const
-{
- if (!IsValid())
- return 0;
- return m_type_system->GetNumChildren(m_type, omit_empty_base_classes);
-}
-
-lldb::BasicType
-ClangASTType::GetBasicTypeEnumeration () const
-{
- if (IsValid())
- return m_type_system->GetBasicTypeEnumeration(m_type);
- return eBasicTypeInvalid;
-}
-
-
-
-uint32_t
-ClangASTType::GetNumFields () const
-{
- if (!IsValid())
- return 0;
- return m_type_system->GetNumFields(m_type);
-}
-
-ClangASTType
-ClangASTType::GetFieldAtIndex (size_t idx,
- std::string& name,
- uint64_t *bit_offset_ptr,
- uint32_t *bitfield_bit_size_ptr,
- bool *is_bitfield_ptr) const
-{
- if (!IsValid())
- return ClangASTType();
- return m_type_system->GetFieldAtIndex(m_type, idx, name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr);
-}
-
-uint32_t
-ClangASTType::GetIndexOfFieldWithName (const char* name,
- ClangASTType* field_clang_type_ptr,
- uint64_t *bit_offset_ptr,
- uint32_t *bitfield_bit_size_ptr,
- bool *is_bitfield_ptr) const
-{
- unsigned count = GetNumFields();
- std::string field_name;
- for (unsigned index = 0; index < count; index++)
- {
- ClangASTType field_clang_type (GetFieldAtIndex(index, field_name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
- if (strcmp(field_name.c_str(), name) == 0)
- {
- if (field_clang_type_ptr)
- *field_clang_type_ptr = field_clang_type;
- return index;
- }
- }
- return UINT32_MAX;
-}
-
-
-ClangASTType
-ClangASTType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
- size_t idx,
- bool transparent_pointers,
- bool omit_empty_base_classes,
- bool ignore_array_bounds,
- std::string& child_name,
- uint32_t &child_byte_size,
- int32_t &child_byte_offset,
- uint32_t &child_bitfield_bit_size,
- uint32_t &child_bitfield_bit_offset,
- bool &child_is_base_class,
- bool &child_is_deref_of_parent,
- ValueObject *valobj) const
-{
- if (!IsValid())
- return ClangASTType();
- return m_type_system->GetChildClangTypeAtIndex(m_type,
- exe_ctx,
- idx,
- transparent_pointers,
- omit_empty_base_classes,
- ignore_array_bounds,
- child_name,
- child_byte_size,
- child_byte_offset,
- child_bitfield_bit_size,
- child_bitfield_bit_offset,
- child_is_base_class,
- child_is_deref_of_parent,
- valobj);
-}
-
-// Look for a child member (doesn't include base classes, but it does include
-// their members) in the type hierarchy. Returns an index path into "clang_type"
-// on how to reach the appropriate member.
-//
-// class A
-// {
-// public:
-// int m_a;
-// int m_b;
-// };
-//
-// class B
-// {
-// };
-//
-// class C :
-// public B,
-// public A
-// {
-// };
-//
-// If we have a clang type that describes "class C", and we wanted to looked
-// "m_b" in it:
-//
-// With omit_empty_base_classes == false we would get an integer array back with:
-// { 1, 1 }
-// The first index 1 is the child index for "class A" within class C
-// The second index 1 is the child index for "m_b" within class A
-//
-// With omit_empty_base_classes == true we would get an integer array back with:
-// { 0, 1 }
-// The first index 0 is the child index for "class A" within class C (since class B doesn't have any members it doesn't count)
-// The second index 1 is the child index for "m_b" within class A
-
-size_t
-ClangASTType::GetIndexOfChildMemberWithName (const char *name,
- bool omit_empty_base_classes,
- std::vector<uint32_t>& child_indexes) const
-{
- if (IsValid() && name && name[0])
- {
- return m_type_system->GetIndexOfChildMemberWithName(m_type, name, omit_empty_base_classes, child_indexes);
- }
- return 0;
-}
-
-
-// Get the index of the child of "clang_type" whose name matches. This function
-// doesn't descend into the children, but only looks one level deep and name
-// matches can include base class names.
-
-uint32_t
-ClangASTType::GetIndexOfChildWithName (const char *name, bool omit_empty_base_classes) const
-{
- if (IsValid() && name && name[0])
- {
- return m_type_system->GetIndexOfChildWithName(m_type, name, omit_empty_base_classes);
- }
- return UINT32_MAX;
-}
-
-size_t
-ClangASTType::ConvertStringToFloatValue (const char *s, uint8_t *dst, size_t dst_size) const
-{
- if (IsValid())
- return m_type_system->ConvertStringToFloatValue(m_type, s, dst, dst_size);
- return 0;
-}
-
-
-
-//----------------------------------------------------------------------
-// Dumping types
-//----------------------------------------------------------------------
-#define DEPTH_INCREMENT 2
-
-void
-ClangASTType::DumpValue (ExecutionContext *exe_ctx,
- Stream *s,
- lldb::Format format,
- const lldb_private::DataExtractor &data,
- lldb::offset_t data_byte_offset,
- size_t data_byte_size,
- uint32_t bitfield_bit_size,
- uint32_t bitfield_bit_offset,
- bool show_types,
- bool show_summary,
- bool verbose,
- uint32_t depth)
-{
- if (!IsValid())
- return;
- m_type_system->DumpValue(m_type, exe_ctx, s, format, data, data_byte_offset, data_byte_size, bitfield_bit_size, bitfield_bit_offset, show_types, show_summary, verbose, depth);
-}
-
-
-
-
-bool
-ClangASTType::DumpTypeValue (Stream *s,
- lldb::Format format,
- const lldb_private::DataExtractor &data,
- lldb::offset_t byte_offset,
- size_t byte_size,
- uint32_t bitfield_bit_size,
- uint32_t bitfield_bit_offset,
- ExecutionContextScope *exe_scope)
-{
- if (!IsValid())
- return false;
- return m_type_system->DumpTypeValue(m_type, s, format, data, byte_offset, byte_size, bitfield_bit_size, bitfield_bit_offset, exe_scope);
-}
-
-
-
-void
-ClangASTType::DumpSummary (ExecutionContext *exe_ctx,
- Stream *s,
- const lldb_private::DataExtractor &data,
- lldb::offset_t data_byte_offset,
- size_t data_byte_size)
-{
- if (IsValid())
- m_type_system->DumpSummary(m_type, exe_ctx, s, data, data_byte_offset, data_byte_size);
-}
-
-void
-ClangASTType::DumpTypeDescription () const
-{
- if (IsValid())
- m_type_system->DumpTypeDescription(m_type);
-}
-
-void
-ClangASTType::DumpTypeDescription (Stream *s) const
-{
- if (IsValid())
- {
- m_type_system->DumpTypeDescription(m_type, s);
- }
-}
-
-bool
-ClangASTType::GetValueAsScalar (const lldb_private::DataExtractor &data,
- lldb::offset_t data_byte_offset,
- size_t data_byte_size,
- Scalar &value) const
-{
- if (!IsValid())
- return false;
-
- if (IsAggregateType ())
- {
- return false; // Aggregate types don't have scalar values
- }
- else
- {
- uint64_t count = 0;
- lldb::Encoding encoding = GetEncoding (count);
-
- if (encoding == lldb::eEncodingInvalid || count != 1)
- return false;
-
- const uint64_t byte_size = GetByteSize(nullptr);
- lldb::offset_t offset = data_byte_offset;
- switch (encoding)
- {
- case lldb::eEncodingInvalid:
- break;
- case lldb::eEncodingVector:
- break;
- case lldb::eEncodingUint:
- if (byte_size <= sizeof(unsigned long long))
- {
- uint64_t uval64 = data.GetMaxU64 (&offset, byte_size);
- if (byte_size <= sizeof(unsigned int))
- {
- value = (unsigned int)uval64;
- return true;
- }
- else if (byte_size <= sizeof(unsigned long))
- {
- value = (unsigned long)uval64;
- return true;
- }
- else if (byte_size <= sizeof(unsigned long long))
- {
- value = (unsigned long long )uval64;
- return true;
- }
- else
- value.Clear();
- }
- break;
-
- case lldb::eEncodingSint:
- if (byte_size <= sizeof(long long))
- {
- int64_t sval64 = data.GetMaxS64 (&offset, byte_size);
- if (byte_size <= sizeof(int))
- {
- value = (int)sval64;
- return true;
- }
- else if (byte_size <= sizeof(long))
- {
- value = (long)sval64;
- return true;
- }
- else if (byte_size <= sizeof(long long))
- {
- value = (long long )sval64;
- return true;
- }
- else
- value.Clear();
- }
- break;
-
- case lldb::eEncodingIEEE754:
- if (byte_size <= sizeof(long double))
- {
- uint32_t u32;
- uint64_t u64;
- if (byte_size == sizeof(float))
- {
- if (sizeof(float) == sizeof(uint32_t))
- {
- u32 = data.GetU32(&offset);
- value = *((float *)&u32);
- return true;
- }
- else if (sizeof(float) == sizeof(uint64_t))
- {
- u64 = data.GetU64(&offset);
- value = *((float *)&u64);
- return true;
- }
- }
- else
- if (byte_size == sizeof(double))
- {
- if (sizeof(double) == sizeof(uint32_t))
- {
- u32 = data.GetU32(&offset);
- value = *((double *)&u32);
- return true;
- }
- else if (sizeof(double) == sizeof(uint64_t))
- {
- u64 = data.GetU64(&offset);
- value = *((double *)&u64);
- return true;
- }
- }
- else
- if (byte_size == sizeof(long double))
- {
- if (sizeof(long double) == sizeof(uint32_t))
- {
- u32 = data.GetU32(&offset);
- value = *((long double *)&u32);
- return true;
- }
- else if (sizeof(long double) == sizeof(uint64_t))
- {
- u64 = data.GetU64(&offset);
- value = *((long double *)&u64);
- return true;
- }
- }
- }
- break;
- }
- }
- return false;
-}
-
-bool
-ClangASTType::SetValueFromScalar (const Scalar &value, Stream &strm)
-{
- if (!IsValid())
- return false;
-
- // Aggregate types don't have scalar values
- if (!IsAggregateType ())
- {
- strm.GetFlags().Set(Stream::eBinary);
- uint64_t count = 0;
- lldb::Encoding encoding = GetEncoding (count);
-
- if (encoding == lldb::eEncodingInvalid || count != 1)
- return false;
-
- const uint64_t bit_width = GetBitSize(nullptr);
- // This function doesn't currently handle non-byte aligned assignments
- if ((bit_width % 8) != 0)
- return false;
-
- const uint64_t byte_size = (bit_width + 7 ) / 8;
- switch (encoding)
- {
- case lldb::eEncodingInvalid:
- break;
- case lldb::eEncodingVector:
- break;
- case lldb::eEncodingUint:
- switch (byte_size)
- {
- case 1: strm.PutHex8(value.UInt()); return true;
- case 2: strm.PutHex16(value.UInt()); return true;
- case 4: strm.PutHex32(value.UInt()); return true;
- case 8: strm.PutHex64(value.ULongLong()); return true;
- default:
- break;
- }
- break;
-
- case lldb::eEncodingSint:
- switch (byte_size)
- {
- case 1: strm.PutHex8(value.SInt()); return true;
- case 2: strm.PutHex16(value.SInt()); return true;
- case 4: strm.PutHex32(value.SInt()); return true;
- case 8: strm.PutHex64(value.SLongLong()); return true;
- default:
- break;
- }
- break;
-
- case lldb::eEncodingIEEE754:
- if (byte_size <= sizeof(long double))
- {
- if (byte_size == sizeof(float))
- {
- strm.PutFloat(value.Float());
- return true;
- }
- else
- if (byte_size == sizeof(double))
- {
- strm.PutDouble(value.Double());
- return true;
- }
- else
- if (byte_size == sizeof(long double))
- {
- strm.PutDouble(value.LongDouble());
- return true;
- }
- }
- break;
- }
- }
- return false;
-}
-
-bool
-ClangASTType::ReadFromMemory (lldb_private::ExecutionContext *exe_ctx,
- lldb::addr_t addr,
- AddressType address_type,
- lldb_private::DataExtractor &data)
-{
- if (!IsValid())
- return false;
-
- // Can't convert a file address to anything valid without more
- // context (which Module it came from)
- if (address_type == eAddressTypeFile)
- return false;
-
- if (!GetCompleteType())
- return false;
-
- const uint64_t byte_size = GetByteSize(exe_ctx ? exe_ctx->GetBestExecutionContextScope() : NULL);
- if (data.GetByteSize() < byte_size)
- {
- lldb::DataBufferSP data_sp(new DataBufferHeap (byte_size, '\0'));
- data.SetData(data_sp);
- }
-
- uint8_t* dst = (uint8_t*)data.PeekData(0, byte_size);
- if (dst != nullptr)
- {
- if (address_type == eAddressTypeHost)
- {
- if (addr == 0)
- return false;
- // The address is an address in this process, so just copy it
- memcpy (dst, (uint8_t*)nullptr + addr, byte_size);
- return true;
- }
- else
- {
- Process *process = nullptr;
- if (exe_ctx)
- process = exe_ctx->GetProcessPtr();
- if (process)
- {
- Error error;
- return process->ReadMemory(addr, dst, byte_size, error) == byte_size;
- }
- }
- }
- return false;
-}
-
-bool
-ClangASTType::WriteToMemory (lldb_private::ExecutionContext *exe_ctx,
- lldb::addr_t addr,
- AddressType address_type,
- StreamString &new_value)
-{
- if (!IsValid())
- return false;
-
- // Can't convert a file address to anything valid without more
- // context (which Module it came from)
- if (address_type == eAddressTypeFile)
- return false;
-
- if (!GetCompleteType())
- return false;
-
- const uint64_t byte_size = GetByteSize(exe_ctx ? exe_ctx->GetBestExecutionContextScope() : NULL);
-
- if (byte_size > 0)
- {
- if (address_type == eAddressTypeHost)
- {
- // The address is an address in this process, so just copy it
- memcpy ((void *)addr, new_value.GetData(), byte_size);
- return true;
- }
- else
- {
- Process *process = nullptr;
- if (exe_ctx)
- process = exe_ctx->GetProcessPtr();
- if (process)
- {
- Error error;
- return process->WriteMemory(addr, new_value.GetData(), byte_size, error) == byte_size;
- }
- }
- }
- return false;
-}
-
-//clang::CXXRecordDecl *
-//ClangASTType::GetAsCXXRecordDecl (lldb::clang_type_t opaque_clang_qual_type)
-//{
-// if (opaque_clang_qual_type)
-// return clang::QualType::getFromOpaquePtr(opaque_clang_qual_type)->getAsCXXRecordDecl();
-// return NULL;
-//}
-
-bool
-lldb_private::operator == (const lldb_private::ClangASTType &lhs, const lldb_private::ClangASTType &rhs)
-{
- return lhs.GetTypeSystem() == rhs.GetTypeSystem() && lhs.GetOpaqueQualType() == rhs.GetOpaqueQualType();
-}
-
-
-bool
-lldb_private::operator != (const lldb_private::ClangASTType &lhs, const lldb_private::ClangASTType &rhs)
-{
- return lhs.GetTypeSystem() != rhs.GetTypeSystem() || lhs.GetOpaqueQualType() != rhs.GetOpaqueQualType();
-}
-
-
-
Copied: lldb/trunk/source/Symbol/CompilerType.cpp (from r244679, lldb/trunk/source/Symbol/ClangASTType.cpp)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CompilerType.cpp?p2=lldb/trunk/source/Symbol/CompilerType.cpp&p1=lldb/trunk/source/Symbol/ClangASTType.cpp&r1=244679&r2=244689&rev=244689&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTType.cpp (original)
+++ lldb/trunk/source/Symbol/CompilerType.cpp Tue Aug 11 17:53:00 2015
@@ -1,4 +1,4 @@
-//===-- ClangASTType.cpp ----------------------------------------*- C++ -*-===//
+//===-- CompilerType.cpp ----------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,31 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Symbol/ClangASTType.h"
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Attr.h"
-#include "clang/AST/CXXInheritance.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclObjC.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/RecordLayout.h"
-#include "clang/AST/Type.h"
-#include "clang/AST/VTableBuilder.h"
-
-#include "clang/Basic/Builtins.h"
-#include "clang/Basic/IdentifierTable.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-
-#include "llvm/Support/Format.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/FormattedStream.h"
-#include "llvm/Support/raw_ostream.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Core/ConstString.h"
#include "lldb/Core/DataBufferHeap.h"
@@ -55,21 +31,21 @@
using namespace lldb;
using namespace lldb_private;
-ClangASTType::ClangASTType (TypeSystem *type_system,
+CompilerType::CompilerType (TypeSystem *type_system,
void* type) :
m_type (type),
m_type_system (type_system)
{
}
-ClangASTType::ClangASTType (clang::ASTContext *ast,
+CompilerType::CompilerType (clang::ASTContext *ast,
clang::QualType qual_type) :
m_type (qual_type.getAsOpaquePtr()),
m_type_system (ClangASTContext::GetASTContext(ast))
{
}
-ClangASTType::~ClangASTType()
+CompilerType::~CompilerType()
{
}
@@ -78,7 +54,7 @@ ClangASTType::~ClangASTType()
//----------------------------------------------------------------------
bool
-ClangASTType::IsAggregateType () const
+CompilerType::IsAggregateType () const
{
if (IsValid())
return m_type_system->IsAggregateType(m_type);
@@ -86,7 +62,7 @@ ClangASTType::IsAggregateType () const
}
bool
-ClangASTType::IsArrayType (ClangASTType *element_type_ptr,
+CompilerType::IsArrayType (CompilerType *element_type_ptr,
uint64_t *size,
bool *is_incomplete) const
{
@@ -103,7 +79,7 @@ ClangASTType::IsArrayType (ClangASTType
}
bool
-ClangASTType::IsVectorType (ClangASTType *element_type,
+CompilerType::IsVectorType (CompilerType *element_type,
uint64_t *size) const
{
if (IsValid())
@@ -112,7 +88,7 @@ ClangASTType::IsVectorType (ClangASTType
}
bool
-ClangASTType::IsRuntimeGeneratedType () const
+CompilerType::IsRuntimeGeneratedType () const
{
if (IsValid())
return m_type_system->IsRuntimeGeneratedType(m_type);
@@ -120,7 +96,7 @@ ClangASTType::IsRuntimeGeneratedType ()
}
bool
-ClangASTType::IsCharType () const
+CompilerType::IsCharType () const
{
if (IsValid())
return m_type_system->IsCharType(m_type);
@@ -129,7 +105,7 @@ ClangASTType::IsCharType () const
bool
-ClangASTType::IsCompleteType () const
+CompilerType::IsCompleteType () const
{
if (IsValid())
return m_type_system->IsCompleteType(m_type);
@@ -137,7 +113,7 @@ ClangASTType::IsCompleteType () const
}
bool
-ClangASTType::IsConst() const
+CompilerType::IsConst() const
{
if (IsValid())
return m_type_system->IsConst(m_type);
@@ -145,7 +121,7 @@ ClangASTType::IsConst() const
}
bool
-ClangASTType::IsCStringType (uint32_t &length) const
+CompilerType::IsCStringType (uint32_t &length) const
{
if (IsValid())
return m_type_system->IsCStringType(m_type, length);
@@ -153,7 +129,7 @@ ClangASTType::IsCStringType (uint32_t &l
}
bool
-ClangASTType::IsFunctionType (bool *is_variadic_ptr) const
+CompilerType::IsFunctionType (bool *is_variadic_ptr) const
{
if (IsValid())
return m_type_system->IsFunctionType(m_type, is_variadic_ptr);
@@ -162,7 +138,7 @@ ClangASTType::IsFunctionType (bool *is_v
// Used to detect "Homogeneous Floating-point Aggregates"
uint32_t
-ClangASTType::IsHomogeneousAggregate (ClangASTType* base_type_ptr) const
+CompilerType::IsHomogeneousAggregate (CompilerType* base_type_ptr) const
{
if (IsValid())
return m_type_system->IsHomogeneousAggregate(m_type, base_type_ptr);
@@ -170,23 +146,23 @@ ClangASTType::IsHomogeneousAggregate (Cl
}
size_t
-ClangASTType::GetNumberOfFunctionArguments () const
+CompilerType::GetNumberOfFunctionArguments () const
{
if (IsValid())
return m_type_system->GetNumberOfFunctionArguments(m_type);
return 0;
}
-ClangASTType
-ClangASTType::GetFunctionArgumentAtIndex (const size_t index) const
+CompilerType
+CompilerType::GetFunctionArgumentAtIndex (const size_t index) const
{
if (IsValid())
return m_type_system->GetFunctionArgumentAtIndex(m_type, index);
- return ClangASTType();
+ return CompilerType();
}
bool
-ClangASTType::IsFunctionPointerType () const
+CompilerType::IsFunctionPointerType () const
{
if (IsValid())
return m_type_system->IsFunctionPointerType(m_type);
@@ -195,7 +171,7 @@ ClangASTType::IsFunctionPointerType () c
}
bool
-ClangASTType::IsIntegerType (bool &is_signed) const
+CompilerType::IsIntegerType (bool &is_signed) const
{
if (IsValid())
return m_type_system->IsIntegerType(m_type, is_signed);
@@ -203,7 +179,7 @@ ClangASTType::IsIntegerType (bool &is_si
}
bool
-ClangASTType::IsPointerType (ClangASTType *pointee_type) const
+CompilerType::IsPointerType (CompilerType *pointee_type) const
{
if (IsValid())
{
@@ -216,7 +192,7 @@ ClangASTType::IsPointerType (ClangASTTyp
bool
-ClangASTType::IsPointerOrReferenceType (ClangASTType *pointee_type) const
+CompilerType::IsPointerOrReferenceType (CompilerType *pointee_type) const
{
if (IsValid())
{
@@ -229,7 +205,7 @@ ClangASTType::IsPointerOrReferenceType (
bool
-ClangASTType::IsReferenceType (ClangASTType *pointee_type, bool* is_rvalue) const
+CompilerType::IsReferenceType (CompilerType *pointee_type, bool* is_rvalue) const
{
if (IsValid())
{
@@ -241,7 +217,7 @@ ClangASTType::IsReferenceType (ClangASTT
}
bool
-ClangASTType::IsFloatingPointType (uint32_t &count, bool &is_complex) const
+CompilerType::IsFloatingPointType (uint32_t &count, bool &is_complex) const
{
if (IsValid())
{
@@ -254,7 +230,7 @@ ClangASTType::IsFloatingPointType (uint3
bool
-ClangASTType::IsDefined() const
+CompilerType::IsDefined() const
{
if (IsValid())
return m_type_system->IsDefined(m_type);
@@ -262,7 +238,7 @@ ClangASTType::IsDefined() const
}
bool
-ClangASTType::IsPolymorphicClass () const
+CompilerType::IsPolymorphicClass () const
{
if (IsValid())
{
@@ -272,7 +248,7 @@ ClangASTType::IsPolymorphicClass () cons
}
bool
-ClangASTType::IsPossibleDynamicType (ClangASTType *dynamic_pointee_type,
+CompilerType::IsPossibleDynamicType (CompilerType *dynamic_pointee_type,
bool check_cplusplus,
bool check_objc) const
{
@@ -283,7 +259,7 @@ ClangASTType::IsPossibleDynamicType (Cla
bool
-ClangASTType::IsScalarType () const
+CompilerType::IsScalarType () const
{
if (!IsValid())
return false;
@@ -292,7 +268,7 @@ ClangASTType::IsScalarType () const
}
bool
-ClangASTType::IsTypedefType () const
+CompilerType::IsTypedefType () const
{
if (!IsValid())
return false;
@@ -300,7 +276,7 @@ ClangASTType::IsTypedefType () const
}
bool
-ClangASTType::IsVoidType () const
+CompilerType::IsVoidType () const
{
if (!IsValid())
return false;
@@ -308,7 +284,7 @@ ClangASTType::IsVoidType () const
}
bool
-ClangASTType::IsPointerToScalarType () const
+CompilerType::IsPointerToScalarType () const
{
if (!IsValid())
return false;
@@ -317,16 +293,16 @@ ClangASTType::IsPointerToScalarType () c
}
bool
-ClangASTType::IsArrayOfScalarType () const
+CompilerType::IsArrayOfScalarType () const
{
- ClangASTType element_type;
+ CompilerType element_type;
if (IsArrayType(&element_type, nullptr, nullptr))
return element_type.IsScalarType();
return false;
}
bool
-ClangASTType::IsBeingDefined () const
+CompilerType::IsBeingDefined () const
{
if (!IsValid())
return false;
@@ -338,7 +314,7 @@ ClangASTType::IsBeingDefined () const
//----------------------------------------------------------------------
bool
-ClangASTType::GetCompleteType () const
+CompilerType::GetCompleteType () const
{
if (!IsValid())
return false;
@@ -349,7 +325,7 @@ ClangASTType::GetCompleteType () const
// AST related queries
//----------------------------------------------------------------------
size_t
-ClangASTType::GetPointerByteSize () const
+CompilerType::GetPointerByteSize () const
{
if (m_type_system)
return m_type_system->GetPointerByteSize();
@@ -357,13 +333,13 @@ ClangASTType::GetPointerByteSize () cons
}
ConstString
-ClangASTType::GetConstQualifiedTypeName () const
+CompilerType::GetConstQualifiedTypeName () const
{
return GetConstTypeName ();
}
ConstString
-ClangASTType::GetConstTypeName () const
+CompilerType::GetConstTypeName () const
{
if (IsValid())
{
@@ -375,7 +351,7 @@ ClangASTType::GetConstTypeName () const
}
ConstString
-ClangASTType::GetTypeName () const
+CompilerType::GetTypeName () const
{
if (IsValid())
{
@@ -385,13 +361,13 @@ ClangASTType::GetTypeName () const
}
ConstString
-ClangASTType::GetDisplayTypeName () const
+CompilerType::GetDisplayTypeName () const
{
return GetTypeName();
}
uint32_t
-ClangASTType::GetTypeInfo (ClangASTType *pointee_or_element_clang_type) const
+CompilerType::GetTypeInfo (CompilerType *pointee_or_element_clang_type) const
{
if (!IsValid())
return 0;
@@ -402,7 +378,7 @@ ClangASTType::GetTypeInfo (ClangASTType
lldb::LanguageType
-ClangASTType::GetMinimumLanguage ()
+CompilerType::GetMinimumLanguage ()
{
if (!IsValid())
return lldb::eLanguageTypeC;
@@ -411,7 +387,7 @@ ClangASTType::GetMinimumLanguage ()
}
lldb::TypeClass
-ClangASTType::GetTypeClass () const
+CompilerType::GetTypeClass () const
{
if (!IsValid())
return lldb::eTypeClassInvalid;
@@ -421,21 +397,21 @@ ClangASTType::GetTypeClass () const
}
void
-ClangASTType::SetClangType (TypeSystem* type_system, void* type)
+CompilerType::SetClangType (TypeSystem* type_system, void* type)
{
m_type_system = type_system;
m_type = type;
}
void
-ClangASTType::SetClangType (clang::ASTContext *ast, clang::QualType qual_type)
+CompilerType::SetClangType (clang::ASTContext *ast, clang::QualType qual_type)
{
m_type_system = ClangASTContext::GetASTContext(ast);
m_type = qual_type.getAsOpaquePtr();
}
unsigned
-ClangASTType::GetTypeQualifiers() const
+CompilerType::GetTypeQualifiers() const
{
if (IsValid())
return m_type_system->GetTypeQualifiers(m_type);
@@ -446,36 +422,36 @@ ClangASTType::GetTypeQualifiers() const
// Creating related types
//----------------------------------------------------------------------
-ClangASTType
-ClangASTType::GetArrayElementType (uint64_t *stride) const
+CompilerType
+CompilerType::GetArrayElementType (uint64_t *stride) const
{
if (IsValid())
{
return m_type_system->GetArrayElementType(m_type, stride);
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTType::GetCanonicalType () const
+CompilerType
+CompilerType::GetCanonicalType () const
{
if (IsValid())
return m_type_system->GetCanonicalType(m_type);
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTType::GetFullyUnqualifiedType () const
+CompilerType
+CompilerType::GetFullyUnqualifiedType () const
{
if (IsValid())
return m_type_system->GetFullyUnqualifiedType(m_type);
- return ClangASTType();
+ return CompilerType();
}
int
-ClangASTType::GetFunctionArgumentCount () const
+CompilerType::GetFunctionArgumentCount () const
{
if (IsValid())
{
@@ -484,28 +460,28 @@ ClangASTType::GetFunctionArgumentCount (
return -1;
}
-ClangASTType
-ClangASTType::GetFunctionArgumentTypeAtIndex (size_t idx) const
+CompilerType
+CompilerType::GetFunctionArgumentTypeAtIndex (size_t idx) const
{
if (IsValid())
{
return m_type_system->GetFunctionArgumentTypeAtIndex(m_type, idx);
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTType::GetFunctionReturnType () const
+CompilerType
+CompilerType::GetFunctionReturnType () const
{
if (IsValid())
{
return m_type_system->GetFunctionReturnType(m_type);
}
- return ClangASTType();
+ return CompilerType();
}
size_t
-ClangASTType::GetNumMemberFunctions () const
+CompilerType::GetNumMemberFunctions () const
{
if (IsValid())
{
@@ -515,7 +491,7 @@ ClangASTType::GetNumMemberFunctions () c
}
TypeMemberFunctionImpl
-ClangASTType::GetMemberFunctionAtIndex (size_t idx)
+CompilerType::GetMemberFunctionAtIndex (size_t idx)
{
if (IsValid())
{
@@ -524,48 +500,48 @@ ClangASTType::GetMemberFunctionAtIndex (
return TypeMemberFunctionImpl();
}
-ClangASTType
-ClangASTType::GetNonReferenceType () const
+CompilerType
+CompilerType::GetNonReferenceType () const
{
if (IsValid())
return m_type_system->GetNonReferenceType(m_type);
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTType::GetPointeeType () const
+CompilerType
+CompilerType::GetPointeeType () const
{
if (IsValid())
{
return m_type_system->GetPointeeType(m_type);
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTType::GetPointerType () const
+CompilerType
+CompilerType::GetPointerType () const
{
if (IsValid())
{
return m_type_system->GetPointerType(m_type);
}
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
-ClangASTType::GetTypedefedType () const
+CompilerType
+CompilerType::GetTypedefedType () const
{
if (IsValid())
return m_type_system->GetTypedefedType(m_type);
- return ClangASTType();
+ return CompilerType();
}
-//ClangASTType
-//ClangASTType::RemoveFastQualifiers () const
+//CompilerType
+//CompilerType::RemoveFastQualifiers () const
//{
// if (IsValid())
// return m_type_system->RemoveFastQualifiers(m_type);
-// return ClangASTType();
+// return CompilerType();
//}
@@ -573,19 +549,19 @@ ClangASTType::GetTypedefedType () const
// Create related types using the current type's AST
//----------------------------------------------------------------------
-ClangASTType
-ClangASTType::GetBasicTypeFromAST (lldb::BasicType basic_type) const
+CompilerType
+CompilerType::GetBasicTypeFromAST (lldb::BasicType basic_type) const
{
if (IsValid())
return m_type_system->GetBasicTypeFromAST(m_type, basic_type);
- return ClangASTType();
+ return CompilerType();
}
//----------------------------------------------------------------------
// Exploring the type
//----------------------------------------------------------------------
uint64_t
-ClangASTType::GetBitSize (ExecutionContextScope *exe_scope) const
+CompilerType::GetBitSize (ExecutionContextScope *exe_scope) const
{
if (IsValid())
{
@@ -595,14 +571,14 @@ ClangASTType::GetBitSize (ExecutionConte
}
uint64_t
-ClangASTType::GetByteSize (ExecutionContextScope *exe_scope) const
+CompilerType::GetByteSize (ExecutionContextScope *exe_scope) const
{
return (GetBitSize (exe_scope) + 7) / 8;
}
size_t
-ClangASTType::GetTypeBitAlign () const
+CompilerType::GetTypeBitAlign () const
{
if (IsValid())
return m_type_system->GetTypeBitAlign(m_type);
@@ -611,7 +587,7 @@ ClangASTType::GetTypeBitAlign () const
lldb::Encoding
-ClangASTType::GetEncoding (uint64_t &count) const
+CompilerType::GetEncoding (uint64_t &count) const
{
if (!IsValid())
return lldb::eEncodingInvalid;
@@ -620,7 +596,7 @@ ClangASTType::GetEncoding (uint64_t &cou
}
lldb::Format
-ClangASTType::GetFormat () const
+CompilerType::GetFormat () const
{
if (!IsValid())
return lldb::eFormatDefault;
@@ -629,7 +605,7 @@ ClangASTType::GetFormat () const
}
uint32_t
-ClangASTType::GetNumChildren (bool omit_empty_base_classes) const
+CompilerType::GetNumChildren (bool omit_empty_base_classes) const
{
if (!IsValid())
return 0;
@@ -637,7 +613,7 @@ ClangASTType::GetNumChildren (bool omit_
}
lldb::BasicType
-ClangASTType::GetBasicTypeEnumeration () const
+CompilerType::GetBasicTypeEnumeration () const
{
if (IsValid())
return m_type_system->GetBasicTypeEnumeration(m_type);
@@ -647,28 +623,28 @@ ClangASTType::GetBasicTypeEnumeration ()
uint32_t
-ClangASTType::GetNumFields () const
+CompilerType::GetNumFields () const
{
if (!IsValid())
return 0;
return m_type_system->GetNumFields(m_type);
}
-ClangASTType
-ClangASTType::GetFieldAtIndex (size_t idx,
+CompilerType
+CompilerType::GetFieldAtIndex (size_t idx,
std::string& name,
uint64_t *bit_offset_ptr,
uint32_t *bitfield_bit_size_ptr,
bool *is_bitfield_ptr) const
{
if (!IsValid())
- return ClangASTType();
+ return CompilerType();
return m_type_system->GetFieldAtIndex(m_type, idx, name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr);
}
uint32_t
-ClangASTType::GetIndexOfFieldWithName (const char* name,
- ClangASTType* field_clang_type_ptr,
+CompilerType::GetIndexOfFieldWithName (const char* name,
+ CompilerType* field_clang_type_ptr,
uint64_t *bit_offset_ptr,
uint32_t *bitfield_bit_size_ptr,
bool *is_bitfield_ptr) const
@@ -677,7 +653,7 @@ ClangASTType::GetIndexOfFieldWithName (c
std::string field_name;
for (unsigned index = 0; index < count; index++)
{
- ClangASTType field_clang_type (GetFieldAtIndex(index, field_name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
+ CompilerType field_clang_type (GetFieldAtIndex(index, field_name, bit_offset_ptr, bitfield_bit_size_ptr, is_bitfield_ptr));
if (strcmp(field_name.c_str(), name) == 0)
{
if (field_clang_type_ptr)
@@ -689,8 +665,8 @@ ClangASTType::GetIndexOfFieldWithName (c
}
-ClangASTType
-ClangASTType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
+CompilerType
+CompilerType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
size_t idx,
bool transparent_pointers,
bool omit_empty_base_classes,
@@ -705,7 +681,7 @@ ClangASTType::GetChildClangTypeAtIndex (
ValueObject *valobj) const
{
if (!IsValid())
- return ClangASTType();
+ return CompilerType();
return m_type_system->GetChildClangTypeAtIndex(m_type,
exe_ctx,
idx,
@@ -757,7 +733,7 @@ ClangASTType::GetChildClangTypeAtIndex (
// The second index 1 is the child index for "m_b" within class A
size_t
-ClangASTType::GetIndexOfChildMemberWithName (const char *name,
+CompilerType::GetIndexOfChildMemberWithName (const char *name,
bool omit_empty_base_classes,
std::vector<uint32_t>& child_indexes) const
{
@@ -774,7 +750,7 @@ ClangASTType::GetIndexOfChildMemberWithN
// matches can include base class names.
uint32_t
-ClangASTType::GetIndexOfChildWithName (const char *name, bool omit_empty_base_classes) const
+CompilerType::GetIndexOfChildWithName (const char *name, bool omit_empty_base_classes) const
{
if (IsValid() && name && name[0])
{
@@ -784,7 +760,7 @@ ClangASTType::GetIndexOfChildWithName (c
}
size_t
-ClangASTType::ConvertStringToFloatValue (const char *s, uint8_t *dst, size_t dst_size) const
+CompilerType::ConvertStringToFloatValue (const char *s, uint8_t *dst, size_t dst_size) const
{
if (IsValid())
return m_type_system->ConvertStringToFloatValue(m_type, s, dst, dst_size);
@@ -799,7 +775,7 @@ ClangASTType::ConvertStringToFloatValue
#define DEPTH_INCREMENT 2
void
-ClangASTType::DumpValue (ExecutionContext *exe_ctx,
+CompilerType::DumpValue (ExecutionContext *exe_ctx,
Stream *s,
lldb::Format format,
const lldb_private::DataExtractor &data,
@@ -821,7 +797,7 @@ ClangASTType::DumpValue (ExecutionContex
bool
-ClangASTType::DumpTypeValue (Stream *s,
+CompilerType::DumpTypeValue (Stream *s,
lldb::Format format,
const lldb_private::DataExtractor &data,
lldb::offset_t byte_offset,
@@ -838,7 +814,7 @@ ClangASTType::DumpTypeValue (Stream *s,
void
-ClangASTType::DumpSummary (ExecutionContext *exe_ctx,
+CompilerType::DumpSummary (ExecutionContext *exe_ctx,
Stream *s,
const lldb_private::DataExtractor &data,
lldb::offset_t data_byte_offset,
@@ -849,14 +825,14 @@ ClangASTType::DumpSummary (ExecutionCont
}
void
-ClangASTType::DumpTypeDescription () const
+CompilerType::DumpTypeDescription () const
{
if (IsValid())
m_type_system->DumpTypeDescription(m_type);
}
void
-ClangASTType::DumpTypeDescription (Stream *s) const
+CompilerType::DumpTypeDescription (Stream *s) const
{
if (IsValid())
{
@@ -865,7 +841,7 @@ ClangASTType::DumpTypeDescription (Strea
}
bool
-ClangASTType::GetValueAsScalar (const lldb_private::DataExtractor &data,
+CompilerType::GetValueAsScalar (const lldb_private::DataExtractor &data,
lldb::offset_t data_byte_offset,
size_t data_byte_size,
Scalar &value) const
@@ -1001,7 +977,7 @@ ClangASTType::GetValueAsScalar (const ll
}
bool
-ClangASTType::SetValueFromScalar (const Scalar &value, Stream &strm)
+CompilerType::SetValueFromScalar (const Scalar &value, Stream &strm)
{
if (!IsValid())
return false;
@@ -1080,7 +1056,7 @@ ClangASTType::SetValueFromScalar (const
}
bool
-ClangASTType::ReadFromMemory (lldb_private::ExecutionContext *exe_ctx,
+CompilerType::ReadFromMemory (lldb_private::ExecutionContext *exe_ctx,
lldb::addr_t addr,
AddressType address_type,
lldb_private::DataExtractor &data)
@@ -1130,7 +1106,7 @@ ClangASTType::ReadFromMemory (lldb_priva
}
bool
-ClangASTType::WriteToMemory (lldb_private::ExecutionContext *exe_ctx,
+CompilerType::WriteToMemory (lldb_private::ExecutionContext *exe_ctx,
lldb::addr_t addr,
AddressType address_type,
StreamString &new_value)
@@ -1172,7 +1148,7 @@ ClangASTType::WriteToMemory (lldb_privat
}
//clang::CXXRecordDecl *
-//ClangASTType::GetAsCXXRecordDecl (lldb::clang_type_t opaque_clang_qual_type)
+//CompilerType::GetAsCXXRecordDecl (lldb::clang_type_t opaque_clang_qual_type)
//{
// if (opaque_clang_qual_type)
// return clang::QualType::getFromOpaquePtr(opaque_clang_qual_type)->getAsCXXRecordDecl();
@@ -1180,14 +1156,14 @@ ClangASTType::WriteToMemory (lldb_privat
//}
bool
-lldb_private::operator == (const lldb_private::ClangASTType &lhs, const lldb_private::ClangASTType &rhs)
+lldb_private::operator == (const lldb_private::CompilerType &lhs, const lldb_private::CompilerType &rhs)
{
return lhs.GetTypeSystem() == rhs.GetTypeSystem() && lhs.GetOpaqueQualType() == rhs.GetOpaqueQualType();
}
bool
-lldb_private::operator != (const lldb_private::ClangASTType &lhs, const lldb_private::ClangASTType &rhs)
+lldb_private::operator != (const lldb_private::CompilerType &lhs, const lldb_private::CompilerType &rhs)
{
return lhs.GetTypeSystem() != rhs.GetTypeSystem() || lhs.GetOpaqueQualType() != rhs.GetOpaqueQualType();
}
Modified: lldb/trunk/source/Symbol/Function.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Function.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Function.cpp (original)
+++ lldb/trunk/source/Symbol/Function.cpp Tue Aug 11 17:53:00 2015
@@ -12,7 +12,7 @@
#include "lldb/Core/Module.h"
#include "lldb/Core/Section.h"
#include "lldb/Host/Host.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/CompileUnit.h"
#include "lldb/Symbol/LineTable.h"
#include "lldb/Symbol/SymbolFile.h"
@@ -545,13 +545,13 @@ Function::GetType() const
return m_type;
}
-ClangASTType
+CompilerType
Function::GetClangType()
{
Type *function_type = GetType();
if (function_type)
return function_type->GetClangFullType();
- return ClangASTType();
+ return CompilerType();
}
uint32_t
Modified: lldb/trunk/source/Symbol/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Type.cpp (original)
+++ lldb/trunk/source/Symbol/Type.cpp Tue Aug 11 17:53:00 2015
@@ -15,7 +15,7 @@
#include "lldb/Core/Scalar.h"
#include "lldb/Core/StreamString.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Symbol/SymbolContextScope.h"
@@ -86,7 +86,7 @@ Type::Type
user_id_t encoding_uid,
EncodingDataType encoding_uid_type,
const Declaration& decl,
- const ClangASTType &clang_type,
+ const CompilerType &clang_type,
ResolveState clang_type_resolve_state
) :
std::enable_shared_from_this<Type> (),
@@ -502,7 +502,7 @@ Type::ResolveClangType (ResolveState cla
{
case eEncodingIsUID:
{
- ClangASTType encoding_clang_type = encoding_type->GetClangForwardType();
+ CompilerType encoding_clang_type = encoding_type->GetClangForwardType();
if (encoding_clang_type.IsValid())
{
m_clang_type = encoding_clang_type;
@@ -550,7 +550,7 @@ Type::ResolveClangType (ResolveState cla
else
{
// We have no encoding type, return void?
- ClangASTType void_clang_type (ClangASTContext::GetBasicType(GetClangASTContext().getASTContext(), eBasicTypeVoid));
+ CompilerType void_clang_type (ClangASTContext::GetBasicType(GetClangASTContext().getASTContext(), eBasicTypeVoid));
switch (m_encoding_uid_type)
{
case eEncodingIsUID:
@@ -655,21 +655,21 @@ Type::GetEncodingMask ()
return encoding_mask;
}
-ClangASTType
+CompilerType
Type::GetClangFullType ()
{
ResolveClangType(eResolveStateFull);
return m_clang_type;
}
-ClangASTType
+CompilerType
Type::GetClangLayoutType ()
{
ResolveClangType(eResolveStateLayout);
return m_clang_type;
}
-ClangASTType
+CompilerType
Type::GetClangForwardType ()
{
ResolveClangType (eResolveStateForward);
@@ -699,7 +699,7 @@ Type::Compare(const Type &a, const Type
#if 0 // START REMOVE
-// Move this into ClangASTType
+// Move this into CompilerType
void *
Type::CreateClangPointerType (Type *type)
{
@@ -908,7 +908,7 @@ TypeAndOrName::SetTypeSP (lldb::TypeSP t
}
void
-TypeAndOrName::SetClangASTType (ClangASTType clang_type)
+TypeAndOrName::SetCompilerType (CompilerType clang_type)
{
m_type_pair.SetType(clang_type);
if (m_type_pair)
@@ -944,9 +944,9 @@ TypeAndOrName::HasTypeSP () const
}
bool
-TypeAndOrName::HasClangASTType () const
+TypeAndOrName::HasCompilerType () const
{
- return m_type_pair.GetClangASTType().IsValid();
+ return m_type_pair.GetCompilerType().IsValid();
}
@@ -972,7 +972,7 @@ TypeImpl::TypeImpl (const lldb::TypeSP &
SetType (type_sp);
}
-TypeImpl::TypeImpl (const ClangASTType &clang_type) :
+TypeImpl::TypeImpl (const CompilerType &clang_type) :
m_module_wp (),
m_static_type(),
m_dynamic_type()
@@ -980,7 +980,7 @@ TypeImpl::TypeImpl (const ClangASTType &
SetType (clang_type);
}
-TypeImpl::TypeImpl (const lldb::TypeSP &type_sp, const ClangASTType &dynamic) :
+TypeImpl::TypeImpl (const lldb::TypeSP &type_sp, const CompilerType &dynamic) :
m_module_wp (),
m_static_type (type_sp),
m_dynamic_type(dynamic)
@@ -988,7 +988,7 @@ TypeImpl::TypeImpl (const lldb::TypeSP &
SetType (type_sp, dynamic);
}
-TypeImpl::TypeImpl (const ClangASTType &static_type, const ClangASTType &dynamic_type) :
+TypeImpl::TypeImpl (const CompilerType &static_type, const CompilerType &dynamic_type) :
m_module_wp (),
m_static_type (),
m_dynamic_type()
@@ -996,7 +996,7 @@ TypeImpl::TypeImpl (const ClangASTType &
SetType (static_type, dynamic_type);
}
-TypeImpl::TypeImpl (const TypePair &pair, const ClangASTType &dynamic) :
+TypeImpl::TypeImpl (const TypePair &pair, const CompilerType &dynamic) :
m_module_wp (),
m_static_type (),
m_dynamic_type()
@@ -1015,21 +1015,21 @@ TypeImpl::SetType (const lldb::TypeSP &t
}
void
-TypeImpl::SetType (const ClangASTType &clang_type)
+TypeImpl::SetType (const CompilerType &clang_type)
{
m_module_wp = lldb::ModuleWP();
m_static_type.SetType (clang_type);
}
void
-TypeImpl::SetType (const lldb::TypeSP &type_sp, const ClangASTType &dynamic)
+TypeImpl::SetType (const lldb::TypeSP &type_sp, const CompilerType &dynamic)
{
SetType (type_sp);
m_dynamic_type = dynamic;
}
void
-TypeImpl::SetType (const ClangASTType &clang_type, const ClangASTType &dynamic)
+TypeImpl::SetType (const CompilerType &clang_type, const CompilerType &dynamic)
{
m_module_wp = lldb::ModuleWP();
m_static_type.SetType (clang_type);
@@ -1037,7 +1037,7 @@ TypeImpl::SetType (const ClangASTType &c
}
void
-TypeImpl::SetType (const TypePair &pair, const ClangASTType &dynamic)
+TypeImpl::SetType (const TypePair &pair, const CompilerType &dynamic)
{
m_module_wp = pair.GetModule();
m_static_type = pair;
@@ -1252,8 +1252,8 @@ TypeImpl::GetCanonicalType() const
return TypeImpl();
}
-ClangASTType
-TypeImpl::GetClangASTType (bool prefer_dynamic)
+CompilerType
+TypeImpl::GetCompilerType (bool prefer_dynamic)
{
ModuleSP module_sp;
if (CheckModule (module_sp))
@@ -1263,9 +1263,9 @@ TypeImpl::GetClangASTType (bool prefer_d
if (m_dynamic_type.IsValid())
return m_dynamic_type;
}
- return m_static_type.GetClangASTType();
+ return m_static_type.GetCompilerType();
}
- return ClangASTType();
+ return CompilerType();
}
TypeSystem *
@@ -1279,7 +1279,7 @@ TypeImpl::GetTypeSystem (bool prefer_dyn
if (m_dynamic_type.IsValid())
return m_dynamic_type.GetTypeSystem();
}
- return m_static_type.GetClangASTType().GetTypeSystem();
+ return m_static_type.GetCompilerType().GetTypeSystem();
}
return NULL;
}
@@ -1297,7 +1297,7 @@ TypeImpl::GetDescription (lldb_private::
m_dynamic_type.DumpTypeDescription(&strm);
strm.Printf("\nStatic:\n");
}
- m_static_type.GetClangASTType().DumpTypeDescription(&strm);
+ m_static_type.GetCompilerType().DumpTypeDescription(&strm);
}
else
{
@@ -1331,7 +1331,7 @@ TypeMemberFunctionImpl::GetName () const
return m_name;
}
-ClangASTType
+CompilerType
TypeMemberFunctionImpl::GetType () const
{
return m_type;
@@ -1384,14 +1384,14 @@ TypeMemberFunctionImpl::GetDescription (
return true;
}
-ClangASTType
+CompilerType
TypeMemberFunctionImpl::GetReturnType () const
{
if (m_type)
return m_type.GetFunctionReturnType();
if (m_objc_method_decl)
- return ClangASTType(&m_objc_method_decl->getASTContext(), m_objc_method_decl->getReturnType());
- return ClangASTType();
+ return CompilerType(&m_objc_method_decl->getASTContext(), m_objc_method_decl->getReturnType());
+ return CompilerType();
}
size_t
@@ -1404,7 +1404,7 @@ TypeMemberFunctionImpl::GetNumArguments
return 0;
}
-ClangASTType
+CompilerType
TypeMemberFunctionImpl::GetArgumentAtIndex (size_t idx) const
{
if (m_type)
@@ -1412,13 +1412,13 @@ TypeMemberFunctionImpl::GetArgumentAtInd
if (m_objc_method_decl)
{
if (idx < m_objc_method_decl->param_size())
- return ClangASTType(&m_objc_method_decl->getASTContext(), m_objc_method_decl->parameters()[idx]->getOriginalType());
+ return CompilerType(&m_objc_method_decl->getASTContext(), m_objc_method_decl->parameters()[idx]->getOriginalType());
}
- return ClangASTType();
+ return CompilerType();
}
TypeEnumMemberImpl::TypeEnumMemberImpl (const clang::EnumConstantDecl* enum_member_decl,
- const lldb_private::ClangASTType& integer_type) :
+ const lldb_private::CompilerType& integer_type) :
m_integer_type_sp(),
m_name(),
m_value(),
Modified: lldb/trunk/source/Symbol/Variable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Variable.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Variable.cpp (original)
+++ lldb/trunk/source/Symbol/Variable.cpp Tue Aug 11 17:53:00 2015
@@ -558,7 +558,7 @@ static void
PrivateAutoComplete (StackFrame *frame,
const std::string &partial_path,
const std::string &prefix_path, // Anything that has been resolved already will be in here
- const ClangASTType& clang_type,
+ const CompilerType& clang_type,
StringList &matches,
bool &word_complete);
@@ -567,7 +567,7 @@ PrivateAutoCompleteMembers (StackFrame *
const std::string &partial_member_name,
const std::string &partial_path,
const std::string &prefix_path, // Anything that has been resolved already will be in here
- const ClangASTType& clang_type,
+ const CompilerType& clang_type,
StringList &matches,
bool &word_complete);
@@ -576,7 +576,7 @@ PrivateAutoCompleteMembers (StackFrame *
const std::string &partial_member_name,
const std::string &partial_path,
const std::string &prefix_path, // Anything that has been resolved already will be in here
- const ClangASTType& clang_type,
+ const CompilerType& clang_type,
StringList &matches,
bool &word_complete)
{
@@ -588,7 +588,7 @@ PrivateAutoCompleteMembers (StackFrame *
{
for (uint32_t i = 0; i < num_bases; ++i)
{
- ClangASTType base_class_type (ClangASTContext::GetDirectBaseClassAtIndex(clang_type, i, nullptr));
+ CompilerType base_class_type (ClangASTContext::GetDirectBaseClassAtIndex(clang_type, i, nullptr));
PrivateAutoCompleteMembers (frame,
partial_member_name,
@@ -606,7 +606,7 @@ PrivateAutoCompleteMembers (StackFrame *
{
for (uint32_t i = 0; i < num_vbases; ++i)
{
- ClangASTType vbase_class_type (ClangASTContext::GetVirtualBaseClassAtIndex(clang_type, i,nullptr));
+ CompilerType vbase_class_type (ClangASTContext::GetVirtualBaseClassAtIndex(clang_type, i,nullptr));
PrivateAutoCompleteMembers (frame,
partial_member_name,
@@ -627,7 +627,7 @@ PrivateAutoCompleteMembers (StackFrame *
{
std::string member_name;
- ClangASTType member_clang_type = clang_type.GetFieldAtIndex (i, member_name, nullptr, nullptr, nullptr);
+ CompilerType member_clang_type = clang_type.GetFieldAtIndex (i, member_name, nullptr, nullptr, nullptr);
if (partial_member_name.empty() ||
member_name.find(partial_member_name) == 0)
@@ -654,7 +654,7 @@ static void
PrivateAutoComplete (StackFrame *frame,
const std::string &partial_path,
const std::string &prefix_path, // Anything that has been resolved already will be in here
- const ClangASTType& clang_type,
+ const CompilerType& clang_type,
StringList &matches,
bool &word_complete)
{
@@ -767,7 +767,7 @@ PrivateAutoComplete (StackFrame *frame,
{
case lldb::eTypeClassPointer:
{
- ClangASTType pointee_type(clang_type.GetPointeeType());
+ CompilerType pointee_type(clang_type.GetPointeeType());
if (partial_path[2])
{
// If there is more after the "->", then search deeper
@@ -886,7 +886,7 @@ PrivateAutoComplete (StackFrame *frame,
Type *variable_type = variable->GetType();
if (variable_type)
{
- ClangASTType variable_clang_type (variable_type->GetClangForwardType());
+ CompilerType variable_clang_type (variable_type->GetClangForwardType());
PrivateAutoComplete (frame,
remaining_partial_path,
prefix_path + token, // Anything that has been resolved already will be in here
@@ -923,7 +923,7 @@ Variable::AutoComplete (const ExecutionC
word_complete = false;
std::string partial_path;
std::string prefix_path;
- ClangASTType clang_type;
+ CompilerType clang_type;
if (partial_path_cstr && partial_path_cstr[0])
partial_path = partial_path_cstr;
Modified: lldb/trunk/source/Target/ABI.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ABI.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/ABI.cpp (original)
+++ lldb/trunk/source/Target/ABI.cpp Tue Aug 11 17:53:00 2015
@@ -12,7 +12,7 @@
#include "lldb/Core/Value.h"
#include "lldb/Core/ValueObjectConstResult.h"
#include "lldb/Expression/ClangPersistentVariables.h"
-#include "lldb/Symbol/ClangASTType.h"
+#include "lldb/Symbol/CompilerType.h"
#include "lldb/Target/Target.h"
#include "lldb/Target/Thread.h"
@@ -105,7 +105,7 @@ ABI::GetRegisterInfoByKind (RegisterKind
ValueObjectSP
ABI::GetReturnValueObject (Thread &thread,
- ClangASTType &ast_type,
+ CompilerType &ast_type,
bool persistent) const
{
if (!ast_type.IsValid())
Modified: lldb/trunk/source/Target/ObjCLanguageRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ObjCLanguageRuntime.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/ObjCLanguageRuntime.cpp (original)
+++ lldb/trunk/source/Target/ObjCLanguageRuntime.cpp Tue Aug 11 17:53:00 2015
@@ -152,7 +152,7 @@ ObjCLanguageRuntime::LookupInCompleteCla
}
size_t
-ObjCLanguageRuntime::GetByteOffsetForIvar (ClangASTType &parent_qual_type, const char *ivar_name)
+ObjCLanguageRuntime::GetByteOffsetForIvar (CompilerType &parent_qual_type, const char *ivar_name)
{
return LLDB_INVALID_IVAR_OFFSET;
}
@@ -619,20 +619,20 @@ ObjCLanguageRuntime::GetNonKVOClassDescr
}
-ClangASTType
+CompilerType
ObjCLanguageRuntime::EncodingToType::RealizeType (const char* name, bool for_expression)
{
if (m_scratch_ast_ctx_ap)
return RealizeType(*m_scratch_ast_ctx_ap, name, for_expression);
- return ClangASTType();
+ return CompilerType();
}
-ClangASTType
+CompilerType
ObjCLanguageRuntime::EncodingToType::RealizeType (ClangASTContext& ast_ctx, const char* name, bool for_expression)
{
clang::ASTContext *clang_ast = ast_ctx.getASTContext();
if (!clang_ast)
- return ClangASTType();
+ return CompilerType();
return RealizeType(*clang_ast, name, for_expression);
}
@@ -645,7 +645,7 @@ ObjCLanguageRuntime::GetEncodingToType (
}
bool
-ObjCLanguageRuntime::GetTypeBitSize (const ClangASTType& clang_type,
+ObjCLanguageRuntime::GetTypeBitSize (const CompilerType& clang_type,
uint64_t &size)
{
void *opaque_ptr = clang_type.GetOpaqueQualType();
Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Tue Aug 11 17:53:00 2015
@@ -621,7 +621,7 @@ CheckIfWatchpointsExhausted(Target *targ
// See also Watchpoint::SetWatchpointType(uint32_t type) and
// the OptionGroupWatchpoint::WatchType enum type.
WatchpointSP
-Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const ClangASTType *type, uint32_t kind, Error &error)
+Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const CompilerType *type, uint32_t kind, Error &error)
{
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS));
if (log)
Modified: lldb/trunk/source/Target/Thread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Thread.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/Thread.cpp (original)
+++ lldb/trunk/source/Target/Thread.cpp Tue Aug 11 17:53:00 2015
@@ -1923,7 +1923,7 @@ Thread::ReturnFromFrame (lldb::StackFram
Type *function_type = sc.function->GetType();
if (function_type)
{
- ClangASTType return_type = sc.function->GetClangType().GetFunctionReturnType();
+ CompilerType return_type = sc.function->GetClangType().GetFunctionReturnType();
if (return_type)
{
StreamString s;
Modified: lldb/trunk/source/Target/ThreadPlanCallFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanCallFunction.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanCallFunction.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanCallFunction.cpp Tue Aug 11 17:53:00 2015
@@ -135,7 +135,7 @@ ThreadPlanCallFunction::ConstructorSetup
ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
const Address &function,
- const ClangASTType &return_type,
+ const CompilerType &return_type,
llvm::ArrayRef<addr_t> args,
const EvaluateExpressionOptions &options) :
ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion),
@@ -188,7 +188,7 @@ ThreadPlanCallFunction::ThreadPlanCallFu
m_should_clear_objc_exception_bp(false),
m_should_clear_cxx_exception_bp(false),
m_stop_address(LLDB_INVALID_ADDRESS),
- m_return_type(ClangASTType())
+ m_return_type(CompilerType())
{
}
Modified: lldb/trunk/source/Target/ThreadPlanCallUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanCallUserExpression.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanCallUserExpression.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanCallUserExpression.cpp Tue Aug 11 17:53:00 2015
@@ -42,7 +42,7 @@ ThreadPlanCallUserExpression::ThreadPlan
llvm::ArrayRef<lldb::addr_t> args,
const EvaluateExpressionOptions &options,
lldb::ClangUserExpressionSP &user_expression_sp) :
- ThreadPlanCallFunction (thread, function, ClangASTType(), args, options),
+ ThreadPlanCallFunction (thread, function, CompilerType(), args, options),
m_user_expression_sp (user_expression_sp)
{
// User expressions are generally "User generated" so we should set them up to stop when done.
Modified: lldb/trunk/source/Target/ThreadPlanStepOut.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepOut.cpp?rev=244689&r1=244688&r2=244689&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepOut.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepOut.cpp Tue Aug 11 17:53:00 2015
@@ -533,7 +533,7 @@ ThreadPlanStepOut::CalculateReturnValue
if (m_immediate_step_from_function != NULL)
{
- ClangASTType return_clang_type = m_immediate_step_from_function->GetClangType().GetFunctionReturnType();
+ CompilerType return_clang_type = m_immediate_step_from_function->GetClangType().GetFunctionReturnType();
if (return_clang_type)
{
lldb::ABISP abi_sp = m_thread.GetProcess()->GetABI();
More information about the lldb-commits
mailing list