replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to use the latest LLVM/Clang, to pick up JIT 

changes.

llvm-svn: 131391
This commit is contained in:
Sean Callanan 2011-05-15 22:34:38 +00:00
parent f9933e80f2
commit d12cf8bbc9
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/scripts/build-llvm.pl
View File

@ -26,7 +26,7 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc
our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
our $llvm_revision = "129495";
our $llvm_revision = "131389";
our $llvm_source_dir = "$ENV{SRCROOT}";
our @archs = split (/\s+/, $ENV{ARCHS});

12
lldb/source/Expression/IRForTarget.cpp
View File

@ -455,7 +455,9 @@ IRForTarget::CreateResultVariable (llvm::Module &llvm_module, llvm::Function &ll
values[0] = new_result_global;
values[1] = new_constant_int;
MDNode *persistent_global_md = MDNode::get(llvm_module.getContext(), values, 2);
ArrayRef<Value*> value_ref(values, 2);
MDNode *persistent_global_md = MDNode::get(llvm_module.getContext(), value_ref);
NamedMDNode *named_metadata = llvm_module.getNamedMetadata("clang.global.decl.ptrs");
named_metadata->addOperand(persistent_global_md);
@ -1097,8 +1099,10 @@ IRForTarget::RewritePersistentAlloc (llvm::Instruction *persistent_alloc,
llvm::Value* values[2];
values[0] = persistent_global;
values[1] = constant_int;
ArrayRef<llvm::Value*> value_ref(values, 2);
MDNode *persistent_global_md = MDNode::get(llvm_module.getContext(), values, 2);
MDNode *persistent_global_md = MDNode::get(llvm_module.getContext(), value_ref);
named_metadata->addOperand(persistent_global_md);
// Now, since the variable is a pointer variable, we will drop in a load of that
@ -1490,7 +1494,9 @@ IRForTarget::MaybeHandleCall (Module &llvm_module, CallInst *llvm_call_inst)
Value *values[1];
values[0] = func_name;
MDNode *func_metadata = MDNode::get(llvm_module.getContext(), values, 1);
ArrayRef<Value*> value_ref(values, 1);
MDNode *func_metadata = MDNode::get(llvm_module.getContext(), value_ref);
llvm_call_inst->setMetadata("lldb.call.realName", func_metadata);

3
lldb/source/Symbol/ClangASTContext.cpp
View File

@ -2355,6 +2355,7 @@ ClangASTContext::GetNumPointeeChildren (clang_type_t clang_type)
case clang::BuiltinType::ObjCId:
case clang::BuiltinType::ObjCClass:
case clang::BuiltinType::ObjCSel:
case clang::BuiltinType::BoundMember:
return 1;
}
break;
@ -4338,7 +4339,7 @@ ClangASTContext::GetTypeName (clang_type_t opaque_qual_type)
const TypedefType *typedef_type = qual_type->getAs<TypedefType>();
if (typedef_type)
{
const TypedefDecl *typedef_decl = typedef_type->getDecl();
const TypedefNameDecl *typedef_decl = typedef_type->getDecl();
return_name = typedef_decl->getQualifiedNameAsString();
}
else

4
lldb/source/Symbol/ClangASTType.cpp
View File

@ -60,7 +60,7 @@ ClangASTType::GetClangTypeName (clang_type_t clang_type)
const clang::TypedefType *typedef_type = qual_type->getAs<clang::TypedefType>();
if (typedef_type)
{
const clang::TypedefDecl *typedef_decl = typedef_type->getDecl();
const clang::TypedefNameDecl *typedef_decl = typedef_type->getDecl();
std::string clang_typedef_name (typedef_decl->getQualifiedNameAsString());
if (!clang_typedef_name.empty())
clang_type_name.SetCString (clang_typedef_name.c_str());
@ -1014,7 +1014,7 @@ ClangASTType::DumpTypeDescription (clang::ASTContext *ast_context, clang_type_t
const clang::TypedefType *typedef_type = qual_type->getAs<clang::TypedefType>();
if (typedef_type)
{
const clang::TypedefDecl *typedef_decl = typedef_type->getDecl();
const clang::TypedefNameDecl *typedef_decl = typedef_type->getDecl();
std::string clang_typedef_name (typedef_decl->getQualifiedNameAsString());
if (!clang_typedef_name.empty())
s->PutCString (clang_typedef_name.c_str());