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

changes.

llvm-svn: 131391

4 files changed, 14 insertions, 7 deletions

diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl
index 267eb943766..d0d26b6e919 100644
--- a/lldb/scripts/build-llvm.pl
+++ b/lldb/scripts/build-llvm.pl
@@ -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});
 
diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index 212af48cc6c..9ac4a934a3d 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -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);
     
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index cc9ea13112b..3797769f6f2 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -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
diff --git a/lldb/source/Symbol/ClangASTType.cpp b/lldb/source/Symbol/ClangASTType.cpp
index ad14fd6eac1..c473e1934a1 100644
--- a/lldb/source/Symbol/ClangASTType.cpp
+++ b/lldb/source/Symbol/ClangASTType.cpp
@@ -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());