1 files changed, 21 insertions, 6 deletions
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index f08fcb575bf..1ccb9b7cbf7 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -12,6 +12,8 @@
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/MC/MCAsmBackend.h"
+#include "llvm/MC/MCAssembler.h"
+#include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCDwarf.h"
 #include "llvm/MC/MCELFObjectWriter.h"
 #include "llvm/MC/MCExpr.h"
@@ -22,6 +24,7 @@
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCSubtargetInfo.h"
+#include "llvm/MC/MCValue.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
@@ -114,12 +117,24 @@ public:
 
     assert(Fixup.getOffset() + Size <= Data.size() && "Invalid fixup offset!");
 
-    // Check that uppper bits are either all zeros or all ones.
-    // Specifically ignore overflow/underflow as long as the leakage is
-    // limited to the lower bits. This is to remain compatible with
-    // other assemblers.
-    assert((Size == 0 || isIntN(Size * 8 + 1, Value)) &&
-           "Value does not fit in the Fixup field");
+    int64_t SignedValue = static_cast<int64_t>(Value);
+    if ((Target.isAbsolute() || IsResolved) &&
+        getFixupKindInfo(Fixup.getKind()).Flags &
+            MCFixupKindInfo::FKF_IsPCRel) {
+      // check that PC relative fixup fits into the fixup size.
+      if (Size > 0 && !isIntN(Size * 8, SignedValue))
+        Asm.getContext().reportError(
+            Fixup.getLoc(), "value of " + Twine(SignedValue) +
+                                " is too large for field of " + Twine(Size) +
+                                ((Size == 1) ? " byte." : " bytes."));
+    } else {
+      // Check that uppper bits are either all zeros or all ones.
+      // Specifically ignore overflow/underflow as long as the leakage is
+      // limited to the lower bits. This is to remain compatible with
+      // other assemblers.
+      assert((Size == 0 || isIntN(Size * 8 + 1, SignedValue)) &&
+             "Value does not fit in the Fixup field");
+    }
 
     for (unsigned i = 0; i != Size; ++i)
       Data[Fixup.getOffset() + i] = uint8_t(Value >> (i * 8));