[Lldb-commits] [lldb] r117680 - in /lldb/trunk: include/lldb/Expression/ClangASTSource.h llvm.zip scripts/build-llvm.pl source/Expression/ClangASTSource.cpp source/Symbol/ClangASTContext.cpp

[Sean Callanan]

Author: spyffe
Date: Fri Oct 29 13:38:40 2010
New Revision: 117680

URL: http://llvm.org/viewvc/llvm-project?rev=117680&view=rev
Log:
Updated LLVM to latest version as of 10/28 at
7pm, and made minor integration fixes.

Modified:
    lldb/trunk/include/lldb/Expression/ClangASTSource.h
    lldb/trunk/llvm.zip
    lldb/trunk/scripts/build-llvm.pl
    lldb/trunk/source/Expression/ClangASTSource.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=117680&r1=117679&r2=117680&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Fri Oct 29 13:38:40 2010
@@ -103,6 +103,7 @@
     /// Interface stub that returns true.
     //------------------------------------------------------------------
 	bool FindExternalLexicalDecls(const clang::DeclContext *DC,
+                                  bool (*isKindWeWant)(clang::Decl::Kind),
                                   llvm::SmallVectorImpl<clang::Decl*> &Decls);
     
     //------------------------------------------------------------------

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=117680&r1=117679&r2=117680&view=diff
==============================================================================
Binary files - no diff available.

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=117680&r1=117679&r2=117680&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Fri Oct 29 13:38:40 2010
@@ -25,7 +25,7 @@
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "'{2010-10-01T17:00}'";
+our $llvm_revision = "'{2010-10-28T19:00}'";
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2";
 our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2";

Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=117680&r1=117679&r2=117680&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Fri Oct 29 13:38:40 2010
@@ -105,7 +105,9 @@
 
 // This is used to support iterating through an entire lexical context,
 // which isn't something the debugger should ever need to do.
-bool ClangASTSource::FindExternalLexicalDecls(const DeclContext *DC, llvm::SmallVectorImpl<Decl*> &Decls) {
+bool ClangASTSource::FindExternalLexicalDecls(const DeclContext *DC, 
+                                              bool (*isKindWeWant)(Decl::Kind),
+                                              llvm::SmallVectorImpl<Decl*> &Decls) {
 	// true is for error, that's good enough for me
 	return true;
 }

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=117680&r1=117679&r2=117680&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Oct 29 13:38:40 2010
@@ -161,7 +161,7 @@
 //    llvm::StringRef Vis = getLastArgValue(Args, OPT_fvisibility,
 //                                          "default");
 //    if (Vis == "default")
-        Opts.setVisibilityMode(LangOptions::Default);
+        Opts.setVisibilityMode(DefaultVisibility);
 //    else if (Vis == "hidden")
 //        Opts.setVisibilityMode(LangOptions::Hidden);
 //    else if (Vis == "protected")
@@ -1091,6 +1091,7 @@
                                                      cxx_record_decl,
                                                      DeclarationNameInfo (ast_context->DeclarationNames.getCXXDestructorName (ast_context->getCanonicalType (record_qual_type)), SourceLocation()),
                                                      method_qual_type,
+                                                     NULL,
                                                      is_inline,
                                                      is_implicitly_declared);
     }
@@ -3346,7 +3347,7 @@
                                             SourceLocation(),
                                             name && name[0] ? &ast_context->Idents.get(name) : NULL,
                                             SourceLocation(),
-                                            NULL); //IsScoped, IsFixed);
+                                            NULL, false, false); //IsScoped, IsFixed);
     if (enum_decl)
     {
         // TODO: check if we should be setting the promotion type too?