[Lldb-commits] [lldb] r119847 - in /lldb/trunk: llvm.zip scripts/build-llvm.pl source/Symbol/ClangASTContext.cpp

[Greg Clayton]

Author: gclayton
Date: Fri Nov 19 15:46:54 2010
New Revision: 119847

URL: http://llvm.org/viewvc/llvm-project?rev=119847&view=rev
Log:
Updated to latest and greatest clang for a "print cvr-qualifiers on function 
declarations" fix.


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

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=119847&r1=119846&r2=119847&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=119847&r1=119846&r2=119847&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Fri Nov 19 15:46:54 2010
@@ -25,7 +25,7 @@
 
 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";

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=119847&r1=119846&r2=119847&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Nov 19 15:46:54 2010
@@ -380,7 +380,10 @@
 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 @@
                            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 @@
                            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 @@
     
     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));