[Lldb-commits] [lldb] r138284 - in /lldb/trunk: llvm.zip scripts/build-llvm.pl scripts/llvm.isreg.diff test/lang/c/function_types/TestFunctionTypes.py

[Sean Callanan]

Author: spyffe
Date: Mon Aug 22 17:34:22 2011
New Revision: 138284

URL: http://llvm.org/viewvc/llvm-project?rev=138284&view=rev
Log:
Restored the version of LLVM that we previously
rolled back, and the testcase that the rollback
broke.

The new LLVM has a new ARM disassembler, which
may cause instability.  Keeping the old one would
force us into a contorted position vis-a-vis the
LLVM sources we bring in, so we will address
issues on the new one rather than keeping the old
one around.

Removed:
    lldb/trunk/scripts/llvm.isreg.diff
Modified:
    lldb/trunk/llvm.zip
    lldb/trunk/scripts/build-llvm.pl
    lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=138284&r1=138283&r2=138284&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=138284&r1=138283&r2=138284&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Mon Aug 22 17:34:22 2011
@@ -22,8 +22,8 @@
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "137143";
-our $clang_revision = "137143";
+our $llvm_revision = "137311";
+our $clang_revision = "137311";
 
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our @archs = split (/\s+/, $ENV{ARCHS});

Removed: lldb/trunk/scripts/llvm.isreg.diff
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/llvm.isreg.diff?rev=138283&view=auto
==============================================================================
--- lldb/trunk/scripts/llvm.isreg.diff (original)
+++ lldb/trunk/scripts/llvm.isreg.diff (removed)
@@ -1,12 +0,0 @@
-Index: lib/Target/ARM/AsmParser/ARMAsmParser.cpp
-===================================================================
---- lib/Target/ARM/AsmParser/ARMAsmParser.cpp	(revision 137143)
-+++ lib/Target/ARM/AsmParser/ARMAsmParser.cpp	(working copy)
-@@ -2619,6 +2619,7 @@
-   if (Mnemonic == "mov" && Operands.size() > 4 &&
-       !static_cast<ARMOperand*>(Operands[4])->isARMSOImm() &&
-       static_cast<ARMOperand*>(Operands[4])->isImm0_65535Expr() &&
-+      static_cast<ARMOperand*>(Operands[1])->isReg() &&
-       static_cast<ARMOperand*>(Operands[1])->getReg() == 0) {
-     ARMOperand *Op = static_cast<ARMOperand*>(Operands[1]);
-     Operands.erase(Operands.begin() + 1);

Modified: lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py?rev=138284&r1=138283&r2=138284&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py (original)
+++ lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py Mon Aug 22 17:34:22 2011
@@ -24,12 +24,12 @@
     def test_pointers_with_dsym(self):
         """Test that a function pointer to 'printf' works and can be called."""
         self.buildDsym()
-        #self.function_pointers() # ROLLED BACK
+        self.function_pointers()
     
     def test_pointers_with_dwarf(self):
         """Test that a function pointer to 'printf' works and can be called."""
         self.buildDwarf()
-        #self.function_pointers() # ROLLED BACK
+        self.function_pointers()
 
     def setUp(self):
         # Call super's setUp().