commit c7c30eb52832dc20a7afe6640ac4ab361ff9b9fe
author Pavel Labath <labath@google.com> Mon Jun 08 23:38:06 2015 +0000
committer Pavel Labath <labath@google.com> Mon Jun 08 23:38:06 2015 +0000
tree f92b605a516615b447eefa8d9d21381cfc113b70
parent 4e8e900dd1f21b5b5458affd5d6c2c89f07fdd28

Revert "Introduce a TypeSystem interface to support adding non-clang languages."

This seems to break expression evaluation on the linux build.

llvm-svn: 239366

lldb/source/Target/ObjCLanguageRuntime.cpp

diff --git a/lldb/source/Target/ObjCLanguageRuntime.cpp b/lldb/source/Target/ObjCLanguageRuntime.cpp
index 73d7899..e54dd5b 100644
--- a/lldb/source/Target/ObjCLanguageRuntime.cpp
+++ b/lldb/source/Target/ObjCLanguageRuntime.cpp
@@ -136,7 +136,7 @@
             {
                 TypeSP type_sp (types.GetTypeAtIndex(i));
                 
-                if (ClangASTContext::IsObjCObjectOrInterfaceType(type_sp->GetClangForwardType()))
+                if (type_sp->GetClangForwardType().IsObjCObjectOrInterfaceType())
                 {
                     if (type_sp->IsCompleteObjCClass())
                     {
@@ -648,7 +648,7 @@
 ObjCLanguageRuntime::GetTypeBitSize (const ClangASTType& clang_type,
                                      uint64_t &size)
 {
-    void *opaque_ptr = clang_type.GetOpaqueQualType();
+    void *opaque_ptr = clang_type.GetQualType().getAsOpaquePtr();
     size = m_type_size_cache.Lookup(opaque_ptr);
     // an ObjC object will at least have an ISA, so 0 is definitely not OK
     if (size > 0)