Fix http://llvm.org/bugs/show_bug.cgi?id=10568

Move the reloc size assert into AsmBackend - where it is more apropos.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136855 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index d7ec3d815c28b1ac69e2bcb15ba9554164c296fb..78588ae9acaf856d374564714a03c9e946d460c2 100644 (file)
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -1698,7 +1698,6 @@ unsigned X86ELFObjectWriter::GetRelocType(const MCValue &Target,
       default: llvm_unreachable("invalid fixup kind!");
       case FK_Data_8: Type = ELF::R_X86_64_64; break;
       case X86::reloc_signed_4byte:
-        assert(isInt<32>(Target.getConstant()));
         switch (Modifier) {
         default:
           llvm_unreachable("Unimplemented");

diff --git a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index c90e41ca724facc5494e3107efb91bf3d1a5a323..e7713f34321b340b533f390b697c48e2f95267dd 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -93,6 +93,23 @@ public:
 
     assert(Fixup.getOffset() + Size <= DataSize &&
            "Invalid fixup offset!");
+
+    // Check that the upper bits are either all 0 or all 1's
+    switch (Size) {
+    case 1: 
+      assert((isInt<8>(Value) || isUInt<8>(Value)) && 
+             "Value does not fit in a 1Byte Reloc");
+      break;
+    case 2: 
+      assert((isInt<16>(Value) || isUInt<16>(Value)) && 
+             "Value does not fit in a 2Byte Reloc");
+      break;
+    case 4:
+      assert((isInt<32>(Value) || isUInt<32>(Value)) && 
+             "Value does not fit in a 4Byte Reloc");
+      break;
+    }
+
     for (unsigned i = 0; i != Size; ++i)
       Data[Fixup.getOffset() + i] = uint8_t(Value >> (i * 8));
   }

diff --git a/test/MC/ELF/x86_64-reloc-sizetest.s b/test/MC/ELF/x86_64-reloc-sizetest.s
new file mode 100644 (file)
index 0000000..c899a94
--- /dev/null
+++ b/test/MC/ELF/x86_64-reloc-sizetest.s
@@ -0,0 +1,13 @@
+// RUN: llvm-mc -triple x86_64-linux-gnu -filetype=obj %s | elf-dump | FileCheck %s
+
+// Tests that relocation value fits in the provided size
+// Original bug http://llvm.org/bugs/show_bug.cgi?id=10568
+       
+L: movq $(L + 2147483648),%rax
+
+       
+// CHECK:          Relocation 0x00000000
+// CHECK-NEXT:     'r_offset', 0x00000003
+// CHECK-NEXT:     'r_sym'
+// CHECK-NEXT:     'r_type', 0x0000000b
+// CHECK-NEXT:     'r_addend', 0x80000000