diff options
| author | Sean Callanan <scallanan@apple.com> | 2010-10-29 18:38:40 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2010-10-29 18:38:40 +0000 |
| commit | 31e851c9f38250d365d168fd0d368e9099b1dbe6 (patch) | |
| tree | 89c4339190ed878de9398f44fb3f2d4fb2b3d518 /lldb | |
| parent | 13ff53e7b6270ffe20275cdd7e108c14508e4ecd (diff) | |
| download | bcm5719-llvm-31e851c9f38250d365d168fd0d368e9099b1dbe6.tar.gz bcm5719-llvm-31e851c9f38250d365d168fd0d368e9099b1dbe6.zip | |
Updated LLVM to latest version as of 10/28 at
7pm, and made minor integration fixes.
llvm-svn: 117680
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/include/lldb/Expression/ClangASTSource.h | 1 | ||||
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 2 | ||||
| -rw-r--r-- | lldb/source/Expression/ClangASTSource.cpp | 4 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangASTContext.cpp | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/lldb/include/lldb/Expression/ClangASTSource.h b/lldb/include/lldb/Expression/ClangASTSource.h index ceb038d951e..678901fc5d0 100644 --- a/lldb/include/lldb/Expression/ClangASTSource.h +++ b/lldb/include/lldb/Expression/ClangASTSource.h @@ -103,6 +103,7 @@ public: /// Interface stub that returns true. //------------------------------------------------------------------ bool FindExternalLexicalDecls(const clang::DeclContext *DC, + bool (*isKindWeWant)(clang::Decl::Kind), llvm::SmallVectorImpl<clang::Decl*> &Decls); //------------------------------------------------------------------ diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index a9db7648b68..13ea9db73a6 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -25,7 +25,7 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc 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"; diff --git a/lldb/source/Expression/ClangASTSource.cpp b/lldb/source/Expression/ClangASTSource.cpp index f30cb40dc7d..7d3a8c64aa9 100644 --- a/lldb/source/Expression/ClangASTSource.cpp +++ b/lldb/source/Expression/ClangASTSource.cpp @@ -105,7 +105,9 @@ void ClangASTSource::MaterializeVisibleDecls(const DeclContext *DC) // 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; } diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 760d8ecba59..7ccf64a5310 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -161,7 +161,7 @@ ParseLangArgs // 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 @@ ClangASTContext::AddMethodToCXXRecordType 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 @@ ClangASTContext::CreateEnumerationType (const Declaration &decl, const char *nam 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? |
