commit cf55e88a11e8e746c095e3028c40e13c41628eda
author Alp Toker <alp@nuanti.com> Sat May 03 15:05:45 2014 +0000
committer Alp Toker <alp@nuanti.com> Sat May 03 15:05:45 2014 +0000
tree ce7c98db53991da1dc3c67b084663b542387a8ff
parent 01d9c64055dd9dd5b9abc06589030535ade0b1ee

Track recent changes in clang internals

llvm-svn: 207913

lldb/source/Expression/ClangExpressionParser.cpp

diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp
index bde2469..4eb64aa 100644
--- a/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/lldb/source/Expression/ClangExpressionParser.cpp
@@ -273,11 +273,10 @@
     
     std::unique_ptr<clang::ASTContext> ast_context(new ASTContext(m_compiler->getLangOpts(),
                                                                  m_compiler->getSourceManager(),
-                                                                 &m_compiler->getTarget(),
                                                                  m_compiler->getPreprocessor().getIdentifierTable(),
                                                                  *m_selector_table.get(),
-                                                                 *m_builtin_context.get(),
-                                                                 0));
+                                                                 *m_builtin_context.get()));
+    ast_context->InitBuiltinTypes(m_compiler->getTarget());
     
     ClangExpressionDeclMap *decl_map = m_expr.DeclMap();
     

lldb/source/Symbol/ClangASTContext.cpp

diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 7a847b4..f112a62 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -381,11 +381,10 @@
     {
         m_ast_ap.reset(new ASTContext (*getLanguageOptions(),
                                        *getSourceManager(),
-                                       getTargetInfo(),
                                        *getIdentifierTable(),
                                        *getSelectorTable(),
-                                       *getBuiltinContext(),
-                                       0));
+                                       *getBuiltinContext()));
+        m_ast_ap->InitBuiltinTypes(*getTargetInfo());
         
         if ((m_callback_tag_decl || m_callback_objc_decl) && m_callback_baton)
         {