[Lldb-commits] [lldb] r120749 - in /lldb/trunk: include/lldb/Expression/ClangExpressionParser.h include/lldb/Symbol/ClangASTContext.h llvm.zip scripts/build-llvm.pl source/Core/FileSpec.cpp source/Expression/ClangExpressionParser.cpp source/Symbol/ClangASTContext.cpp
Greg Clayton
gclayton at apple.com
Thu Dec 2 15:20:03 PST 2010
Author: gclayton
Date: Thu Dec 2 17:20:03 2010
New Revision: 120749
URL: http://llvm.org/viewvc/llvm-project?rev=120749&view=rev
Log:
Updated to latest LLVM/Clang for external AST source changes that allow
TagDecl subclasses and Objective C interfaces to complete themselves through
the ExternalASTSource class.
Modified:
lldb/trunk/include/lldb/Expression/ClangExpressionParser.h
lldb/trunk/include/lldb/Symbol/ClangASTContext.h
lldb/trunk/llvm.zip
lldb/trunk/scripts/build-llvm.pl
lldb/trunk/source/Core/FileSpec.cpp
lldb/trunk/source/Expression/ClangExpressionParser.cpp
lldb/trunk/source/Symbol/ClangASTContext.cpp
Modified: lldb/trunk/include/lldb/Expression/ClangExpressionParser.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionParser.h?rev=120749&r1=120748&r2=120749&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionParser.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionParser.h Thu Dec 2 17:20:03 2010
@@ -174,7 +174,6 @@
std::string m_target_triple; ///< The target triple used to initialize LLVM
std::auto_ptr<clang::FileManager> m_file_manager; ///< The Clang file manager object used by the compiler
- std::auto_ptr<clang::FileSystemOptions> m_file_system_options; ///< The Clang file system options object used by the compiler
std::auto_ptr<clang::CompilerInstance> m_compiler; ///< The Clang compiler used to parse expressions into IR
std::auto_ptr<clang::Builtin::Context> m_builtin_context; ///< Context for Clang built-ins
std::auto_ptr<clang::SelectorTable> m_selector_table; ///< Selector table for Objective-C methods
Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=120749&r1=120748&r2=120749&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Thu Dec 2 17:20:03 2010
@@ -75,9 +75,6 @@
clang::FileManager *
getFileManager();
- clang::FileSystemOptions *
- getFileSystemOptions();
-
clang::SourceManager *
getSourceManager();
Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=120749&r1=120748&r2=120749&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=120749&r1=120748&r2=120749&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Thu Dec 2 17:20:03 2010
@@ -25,7 +25,7 @@
our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
-our $llvm_revision = "'{2010-11-19T13:00}'";
+our $llvm_revision = "120727";
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/Core/FileSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FileSpec.cpp?rev=120749&r1=120748&r2=120749&view=diff
==============================================================================
--- lldb/trunk/source/Core/FileSpec.cpp (original)
+++ lldb/trunk/source/Core/FileSpec.cpp Thu Dec 2 17:20:03 2010
@@ -19,8 +19,8 @@
#include <fstream>
#include "llvm/ADT/StringRef.h"
-#include "llvm/System/Path.h"
-#include "llvm/System/Program.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/Program.h"
#include "lldb/Core/FileSpec.h"
#include "lldb/Core/DataBufferHeap.h"
Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=120749&r1=120748&r2=120749&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Thu Dec 2 17:20:03 2010
@@ -54,9 +54,9 @@
#include "llvm/LLVMContext.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/DynamicLibrary.h"
-#include "llvm/System/Host.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/Signals.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetSelect.h"
@@ -243,11 +243,11 @@
// 5. Set up the source management objects inside the compiler
- m_file_manager.reset(new clang::FileManager());
- m_file_system_options.reset(new clang::FileSystemOptions());
+ clang::FileSystemOptions file_system_options;
+ m_file_manager.reset(new clang::FileManager(file_system_options));
if (!m_compiler->hasSourceManager())
- m_compiler->createSourceManager(*m_file_manager.get(), *m_file_system_options.get());
+ m_compiler->createSourceManager(*m_file_manager.get());
m_compiler->createFileManager();
m_compiler->createPreprocessor();
Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=120749&r1=120748&r2=120749&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Thu Dec 2 17:20:03 2010
@@ -356,23 +356,18 @@
ClangASTContext::getFileManager()
{
if (m_file_manager_ap.get() == NULL)
- m_file_manager_ap.reset(new clang::FileManager());
+ {
+ clang::FileSystemOptions file_system_options;
+ m_file_manager_ap.reset(new clang::FileManager(file_system_options));
+ }
return m_file_manager_ap.get();
}
-clang::FileSystemOptions *
-ClangASTContext::getFileSystemOptions()
-{
- if (m_file_system_options_ap.get() == NULL)
- m_file_system_options_ap.reset(new clang::FileSystemOptions());
- return m_file_system_options_ap.get();
-}
-
clang::SourceManager *
ClangASTContext::getSourceManager()
{
if (m_source_manager_ap.get() == NULL)
- m_source_manager_ap.reset(new clang::SourceManager(*getDiagnostic(), *getFileManager(), *getFileSystemOptions()));
+ m_source_manager_ap.reset(new clang::SourceManager(*getDiagnostic(), *getFileManager()));
return m_source_manager_ap.get();
}
@@ -748,33 +743,33 @@
};
clang_type_t
-ClangASTContext::CopyType (ASTContext *dest_context,
- ASTContext *source_context,
+ClangASTContext::CopyType (ASTContext *dst_ast,
+ ASTContext *src_ast,
clang_type_t clang_type)
{
// null_client's ownership is transferred to diagnostics
- FileManager file_manager;
FileSystemOptions file_system_options;
- ASTImporter importer(*dest_context, file_manager, file_system_options,
- *source_context, file_manager, file_system_options);
+ FileManager file_manager (file_system_options);
+ ASTImporter importer(*dst_ast, file_manager,
+ *src_ast, file_manager);
- QualType src = QualType::getFromOpaquePtr(clang_type);
- QualType dst = importer.Import(src);
+ QualType src (QualType::getFromOpaquePtr(clang_type));
+ QualType dst (importer.Import(src));
return dst.getAsOpaquePtr();
}
clang::Decl *
-ClangASTContext::CopyDecl (ASTContext *dest_context,
- ASTContext *source_context,
+ClangASTContext::CopyDecl (ASTContext *dst_ast,
+ ASTContext *src_ast,
clang::Decl *source_decl)
{
// null_client's ownership is transferred to diagnostics
- FileManager file_manager;
FileSystemOptions file_system_options;
- ASTImporter importer(*dest_context, file_manager, file_system_options,
- *source_context, file_manager, file_system_options);
+ FileManager file_manager (file_system_options);
+ ASTImporter importer(*dst_ast, file_manager,
+ *src_ast, file_manager);
return importer.Import(source_decl);
}
More information about the lldb-commits
mailing list