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

[Sean Callanan]

Author: spyffe
Date: Sun May 15 17:34:38 2011
New Revision: 131391

URL: http://llvm.org/viewvc/llvm-project?rev=131391&view=rev
Log:
Updated to use the latest LLVM/Clang, to pick up JIT
changes.

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

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=131391&r1=131390&r2=131391&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=131391&r1=131390&r2=131391&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Sun May 15 17:34:38 2011
@@ -26,7 +26,7 @@
 
 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});
 

Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=131391&r1=131390&r2=131391&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Sun May 15 17:34:38 2011
@@ -455,7 +455,9 @@
     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 @@
     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 @@
     
     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);
     

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=131391&r1=131390&r2=131391&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Sun May 15 17:34:38 2011
@@ -2355,6 +2355,7 @@
         case clang::BuiltinType::ObjCId:
         case clang::BuiltinType::ObjCClass:
         case clang::BuiltinType::ObjCSel:
+        case clang::BuiltinType::BoundMember:
             return 1;
         }
         break;
@@ -4338,7 +4339,7 @@
     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

Modified: lldb/trunk/source/Symbol/ClangASTType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTType.cpp?rev=131391&r1=131390&r2=131391&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTType.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTType.cpp Sun May 15 17:34:38 2011
@@ -60,7 +60,7 @@
         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 @@
                     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());