3 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 48b8c5c8c2c..8718b37b95e 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -338,11 +338,11 @@ ValueObject::MaybeCalculateCompleteType ()
     ClangASTType class_type;
     bool is_pointer_type = false;
     
-    if (ClangASTContext::IsObjCObjectPointerType(clang_type, &class_type))
+    if (clang_type.IsObjCObjectPointerType(&class_type))
     {
         is_pointer_type = true;
     }
-    else if (ClangASTContext::IsObjCObjectOrInterfaceType(clang_type))
+    else if (clang_type.IsObjCObjectOrInterfaceType())
     {
         class_type = clang_type;
     }
@@ -2419,7 +2419,7 @@ ValueObject::GetBaseClassPath (Stream &s)
         bool parent_had_base_class = GetParent() && GetParent()->GetBaseClassPath (s);
         ClangASTType clang_type = GetClangType();
         std::string cxx_class_name;
-        bool this_had_base_class = ClangASTContext::GetCXXClassName (clang_type, cxx_class_name);
+        bool this_had_base_class = clang_type.GetCXXClassName (cxx_class_name);
         if (this_had_base_class)
         {
             if (parent_had_base_class)
diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp
index 9eaa6c3756d..89b98a1db1b 100644
--- a/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -154,7 +154,7 @@ FixupTypeAndOrName (const TypeAndOrName& type_andor_name,
         if (parent.IsPointerType())
             corrected_type = orig_type.GetPointerType ();
         else if (parent.IsPointerOrReferenceType())
-            corrected_type = ClangASTContext::GetLValueReferenceType(orig_type);
+            corrected_type = orig_type.GetLValueReferenceType ();
         ret.SetClangASTType(corrected_type);
     }
     else /*if (m_dynamic_type_info.HasName())*/
diff --git a/lldb/source/Core/ValueObjectMemory.cpp b/lldb/source/Core/ValueObjectMemory.cpp
index 31a8d5c1f4f..9f1953138f6 100644
--- a/lldb/source/Core/ValueObjectMemory.cpp
+++ b/lldb/source/Core/ValueObjectMemory.cpp
@@ -97,7 +97,7 @@ ValueObjectMemory::ValueObjectMemory (ExecutionContextScope *exe_scope,
     m_clang_type(ast_type)
 {
     // Do not attempt to construct one of these objects with no variable!
-    assert (m_clang_type.GetTypeSystem());
+    assert (m_clang_type.GetASTContext());
     assert (m_clang_type.GetOpaqueQualType());
     
     TargetSP target_sp (GetTargetSP());