Updated to revision 123723 of LLVM, to bring in

support for minimal type import functionality.

llvm-svn: 123787

2 files changed, 9 insertions, 11 deletions

diff --git a/lldb/source/Expression/ClangASTSource.cpp b/lldb/source/Expression/ClangASTSource.cpp
index 3ef9e757965..b18536b5f9e 100644
--- a/lldb/source/Expression/ClangASTSource.cpp
+++ b/lldb/source/Expression/ClangASTSource.cpp
@@ -225,16 +225,14 @@ NameSearchContext::AddFunDecl (void *type)
 clang::NamedDecl *
 NameSearchContext::AddGenericFunDecl()
 {
+    FunctionProtoType::ExtProtoInfo proto_info;
+    
+    proto_info.Variadic = true;
+    
     QualType generic_function_type(m_ast_source.m_ast_context.getFunctionType (m_ast_source.m_ast_context.getSizeType(),   // result
-                                                                               NULL,                              // argument types
-                                                                               0,                                 // number of arguments
-                                                                               true,                              // variadic?
-                                                                               0,                                 // type qualifiers
-                                                                               false,                             // has exception specification?
-                                                                               false,                             // has any exception specification?
-                                                                               0,                                 // number of exceptions
-                                                                               NULL,                              // exceptions
-                                                                               FunctionType::ExtInfo()));         // defaults for noreturn, regparm, calling convention
+                                                                               NULL,                                // argument types
+                                                                               0,                                   // number of arguments
+                                                                               proto_info));
     
     return AddFunDecl(generic_function_type.getAsOpaquePtr());
 }
diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp
index adc5a9ecb7e..0a63e4daaf2 100644
--- a/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/lldb/source/Expression/ClangExpressionParser.cpp
@@ -30,7 +30,6 @@
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/Version.h"
-#include "clang/Checker/FrontendActions.h"
 #include "clang/CodeGen/CodeGenAction.h"
 #include "clang/CodeGen/ModuleBuilder.h"
 #include "clang/Driver/CC1Options.h"
@@ -47,6 +46,7 @@
 #include "clang/Parse/ParseAST.h"
 #include "clang/Rewrite/FrontendActions.h"
 #include "clang/Sema/SemaConsumer.h"
+#include "clang/StaticAnalyzer/FrontendActions.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
@@ -153,7 +153,7 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) {
         case RewriteMacros:          return new RewriteMacrosAction();
         case RewriteObjC:            return new RewriteObjCAction();
         case RewriteTest:            return new RewriteTestAction();
-        case RunAnalysis:            return new AnalysisAction();
+        //case RunAnalysis:            return new AnalysisAction();
         case RunPreprocessorOnly:    return new PreprocessOnlyAction();
     }
 }