diff options
| -rw-r--r-- | lldb/source/Expression/ClangExpressionParser.cpp | 5 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangASTContext.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp index bde24691142..4eb64aa5752 100644 --- a/lldb/source/Expression/ClangExpressionParser.cpp +++ b/lldb/source/Expression/ClangExpressionParser.cpp @@ -273,11 +273,10 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope, 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(); diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 7a847b438c5..f112a62b64e 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -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) { |
