diff options
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 2 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangASTContext.cpp | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index e5287f8db93..43de6cd3358 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-11-17T15:30}'"; +our $llvm_revision = "'{2010-11-19T13: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/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 13302756339..c2d73d5cfb2 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -380,7 +380,10 @@ Diagnostic * ClangASTContext::getDiagnostic() { if (m_diagnostic_ap.get() == NULL) - m_diagnostic_ap.reset(new Diagnostic()); + { + llvm::IntrusiveRefCntPtr<DiagnosticIDs> diag_id_sp(new DiagnosticIDs()); + m_diagnostic_ap.reset(new Diagnostic(diag_id_sp)); + } return m_diagnostic_ap.get(); } @@ -750,12 +753,9 @@ ClangASTContext::CopyType (ASTContext *dest_context, clang_type_t clang_type) { // null_client's ownership is transferred to diagnostics - NullDiagnosticClient *null_client = new NullDiagnosticClient; - Diagnostic diagnostics(null_client); FileManager file_manager; FileSystemOptions file_system_options; - ASTImporter importer(diagnostics, - *dest_context, file_manager, file_system_options, + ASTImporter importer(*dest_context, file_manager, file_system_options, *source_context, file_manager, file_system_options); QualType src = QualType::getFromOpaquePtr(clang_type); @@ -771,12 +771,9 @@ ClangASTContext::CopyDecl (ASTContext *dest_context, clang::Decl *source_decl) { // null_client's ownership is transferred to diagnostics - NullDiagnosticClient *null_client = new NullDiagnosticClient; - Diagnostic diagnostics(null_client); FileManager file_manager; FileSystemOptions file_system_options; - ASTImporter importer(diagnostics, - *dest_context, file_manager, file_system_options, + ASTImporter importer(*dest_context, file_manager, file_system_options, *source_context, file_manager, file_system_options); return importer.Import(source_decl); @@ -1100,6 +1097,8 @@ ClangASTContext::AddMethodToCXXRecordType QualType method_qual_type (QualType::getFromOpaquePtr (method_opaque_type)); + method_qual_type.dump(); + CXXMethodDecl *cxx_method_decl = NULL; DeclarationName decl_name (&identifier_table->get(name)); |
