15 files changed, 54 insertions, 54 deletions
diff --git a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
index 73da5ce6004..73ff5e9483d 100644
--- a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
+++ b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
@@ -318,7 +318,7 @@ lldb_private::formatters::WCharStringSummaryProvider (ValueObject& valobj, Strea
     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_SummaryProvider (ObjCLanguageRuntime::C
     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::NSAttributedStringSummaryProvider (ValueObject& valobj
     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::ObjCSELSummaryProvider (ValueObject& valobj, Stream& s
 {
     lldb::ValueObjectSP valobj_sp;
 
-    ClangASTType charstar (valobj.GetClangType().GetBasicTypeFromAST(eBasicTypeChar).GetPointerType());
+    CompilerType charstar (valobj.GetClangType().GetBasicTypeFromAST(eBasicTypeChar).GetPointerType());
     
     if (!charstar)
         return false;
diff --git a/lldb/source/DataFormatters/Cocoa.cpp b/lldb/source/DataFormatters/Cocoa.cpp
index 28f3d4f1d41..11a9553c9f4 100644
--- a/lldb/source/DataFormatters/Cocoa.cpp
+++ b/lldb/source/DataFormatters/Cocoa.cpp
@@ -443,7 +443,7 @@ lldb_private::formatters::NSURLSummaryProvider (ValueObject& valobj, Stream& str
     {
         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)
diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp
index 7e9f9b464f7..ffac7722256 100644
--- a/lldb/source/DataFormatters/FormatManager.cpp
+++ b/lldb/source/DataFormatters/FormatManager.cpp
@@ -162,7 +162,7 @@ FormatManager::GetFormatAsCString (Format format)
 
 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 (ValueObject& valobj,
 
     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 (ValueObject& valobj,
                            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 (ValueObject& valobj,
     
     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 (ValueObject& valobj,
                            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 (ValueObject& valobj,
             } 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 (ValueObject& valobj,
     // 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 (ValueObject& valobj,
             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())
diff --git a/lldb/source/DataFormatters/LibCxxInitializerList.cpp b/lldb/source/DataFormatters/LibCxxInitializerList.cpp
index 1f79f00b2b7..9faa5865311 100644
--- a/lldb/source/DataFormatters/LibCxxInitializerList.cpp
+++ b/lldb/source/DataFormatters/LibCxxInitializerList.cpp
@@ -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;
diff --git a/lldb/source/DataFormatters/LibCxxList.cpp b/lldb/source/DataFormatters/LibCxxList.cpp
index 0430a8f9ef4..0771f6e6f3c 100644
--- a/lldb/source/DataFormatters/LibCxxList.cpp
+++ b/lldb/source/DataFormatters/LibCxxList.cpp
@@ -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::LibcxxStdListSyntheticFrontEnd::Update()
     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();
 
diff --git a/lldb/source/DataFormatters/LibCxxMap.cpp b/lldb/source/DataFormatters/LibCxxMap.cpp
index 2782a3b04e2..8682e88bcef 100644
--- a/lldb/source/DataFormatters/LibCxxMap.cpp
+++ b/lldb/source/DataFormatters/LibCxxMap.cpp
@@ -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::LibcxxStdMapSyntheticFrontEnd::GetValueOffset (const l
         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;
diff --git a/lldb/source/DataFormatters/LibCxxVector.cpp b/lldb/source/DataFormatters/LibCxxVector.cpp
index 6ccb732f677..2461bf60a8f 100644
--- a/lldb/source/DataFormatters/LibCxxVector.cpp
+++ b/lldb/source/DataFormatters/LibCxxVector.cpp
@@ -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;
         };
diff --git a/lldb/source/DataFormatters/LibStdcpp.cpp b/lldb/source/DataFormatters/LibStdcpp.cpp
index 16ee2c1c391..6dfebd24546 100644
--- a/lldb/source/DataFormatters/LibStdcpp.cpp
+++ b/lldb/source/DataFormatters/LibStdcpp.cpp
@@ -78,11 +78,11 @@ lldb_private::formatters::LibstdcppMapIteratorSyntheticFrontEnd::Update()
     
     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;
diff --git a/lldb/source/DataFormatters/NSArray.cpp b/lldb/source/DataFormatters/NSArray.cpp
index 0e665bd3470..a28a00c72fe 100644
--- a/lldb/source/DataFormatters/NSArray.cpp
+++ b/lldb/source/DataFormatters/NSArray.cpp
@@ -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::NSArrayISyntheticFrontEnd::NSArrayISyntheticFrontEnd (
     {
         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::formatters::NSArraySyntheticFrontEndCre
     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))
diff --git a/lldb/source/DataFormatters/NSDictionary.cpp b/lldb/source/DataFormatters/NSDictionary.cpp
index 30e9d3457e9..15f05ab49c3 100644
--- a/lldb/source/DataFormatters/NSDictionary.cpp
+++ b/lldb/source/DataFormatters/NSDictionary.cpp
@@ -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;
         };
         
diff --git a/lldb/source/DataFormatters/NSIndexPath.cpp b/lldb/source/DataFormatters/NSIndexPath.cpp
index 4d6f2c50451..60768b1d15d 100644
--- a/lldb/source/DataFormatters/NSIndexPath.cpp
+++ b/lldb/source/DataFormatters/NSIndexPath.cpp
@@ -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 {
diff --git a/lldb/source/DataFormatters/TypeFormat.cpp b/lldb/source/DataFormatters/TypeFormat.cpp
index c4a65fea7da..095559f8bfb 100644
--- a/lldb/source/DataFormatters/TypeFormat.cpp
+++ b/lldb/source/DataFormatters/TypeFormat.cpp
@@ -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 (ValueObject *valobj,
         }
         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 (ValueObject *valobj,
                 // 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 (ValueObject *valobj,
         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
diff --git a/lldb/source/DataFormatters/TypeSummary.cpp b/lldb/source/DataFormatters/TypeSummary.cpp
index fa06f297f82..fefaa2d8ad3 100644
--- a/lldb/source/DataFormatters/TypeSummary.cpp
+++ b/lldb/source/DataFormatters/TypeSummary.cpp
@@ -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"
 
diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp b/lldb/source/DataFormatters/TypeSynthetic.cpp
index 5bd8d30e487..036f6f65d2e 100644
--- a/lldb/source/DataFormatters/TypeSynthetic.cpp
+++ b/lldb/source/DataFormatters/TypeSynthetic.cpp
@@ -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)
diff --git a/lldb/source/DataFormatters/VectorType.cpp b/lldb/source/DataFormatters/VectorType.cpp
index 666e68cc9d1..408d2ad0cc4 100644
--- a/lldb/source/DataFormatters/VectorType.cpp
+++ b/lldb/source/DataFormatters/VectorType.cpp
@@ -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 format,
 
 static lldb::Format
 GetItemFormatForFormat (lldb::Format format,
-                        ClangASTType element_type)
+                        CompilerType element_type)
 {
     switch (format)
     {
@@ -169,8 +169,8 @@ GetItemFormatForFormat (lldb::Format format,
 }
 
 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;
         };
     }