[Lldb-commits] [lldb] r207913 - Track recent changes in clang internals

[Alp Toker]

Author: alp
Date: Sat May  3 10:05:45 2014
New Revision: 207913

URL: http://llvm.org/viewvc/llvm-project?rev=207913&view=rev
Log:
Track recent changes in clang internals

Modified:
    lldb/trunk/source/Expression/ClangExpressionParser.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=207913&r1=207912&r2=207913&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Sat May  3 10:05:45 2014
@@ -273,11 +273,10 @@ ClangExpressionParser::ClangExpressionPa
     
     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();
     

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=207913&r1=207912&r2=207913&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Sat May  3 10:05:45 2014
@@ -381,11 +381,10 @@ ClangASTContext::getASTContext()
     {
         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)
         {