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. llvm-svn: 138284
This commit is contained in:
parent
944b828abb
commit
60dbc63a89
|
@ -22,8 +22,8 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc
|
||||||
|
|
||||||
our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
|
our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
|
||||||
|
|
||||||
our $llvm_revision = "137143";
|
our $llvm_revision = "137311";
|
||||||
our $clang_revision = "137143";
|
our $clang_revision = "137311";
|
||||||
|
|
||||||
our $llvm_source_dir = "$ENV{SRCROOT}";
|
our $llvm_source_dir = "$ENV{SRCROOT}";
|
||||||
our @archs = split (/\s+/, $ENV{ARCHS});
|
our @archs = split (/\s+/, $ENV{ARCHS});
|
||||||
|
|
|
@ -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);
|
|
|
@ -24,12 +24,12 @@ class FunctionTypesTestCase(TestBase):
|
||||||
def test_pointers_with_dsym(self):
|
def test_pointers_with_dsym(self):
|
||||||
"""Test that a function pointer to 'printf' works and can be called."""
|
"""Test that a function pointer to 'printf' works and can be called."""
|
||||||
self.buildDsym()
|
self.buildDsym()
|
||||||
#self.function_pointers() # ROLLED BACK
|
self.function_pointers()
|
||||||
|
|
||||||
def test_pointers_with_dwarf(self):
|
def test_pointers_with_dwarf(self):
|
||||||
"""Test that a function pointer to 'printf' works and can be called."""
|
"""Test that a function pointer to 'printf' works and can be called."""
|
||||||
self.buildDwarf()
|
self.buildDwarf()
|
||||||
#self.function_pointers() # ROLLED BACK
|
self.function_pointers()
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
# Call super's setUp().
|
# Call super's setUp().
|
||||||
|
|
Loading…
Reference in New Issue