summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-03-08 21:10:39 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-03-08 21:10:39 +0000
commitc6ac7940d924f86ebb5701d1d55bd45b83851e37 (patch)
tree80edef07c23be19beaa63e81c03eb10d9c11a34c
parentb59f7734b9a57fb45bf3e9cdbdf2a4d5cf02173a (diff)
downloadbcm5719-llvm-c6ac7940d924f86ebb5701d1d55bd45b83851e37.tar.gz
bcm5719-llvm-c6ac7940d924f86ebb5701d1d55bd45b83851e37.zip
MC/Mach-O: Error out instead of crashing on invalid scattered relocation expressions.
llvm-svn: 97983
-rw-r--r--llvm/lib/MC/MCAssembler.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index 96227dbee50..3f40a6d6a4c 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -447,13 +447,22 @@ public:
// See <reloc.h>.
const MCSymbol *A = Target.getSymA();
MCSymbolData *SD = SymbolMap.lookup(A);
+
+ if (!SD->getFragment())
+ llvm_report_error("symbol '" + A->getName() +
+ "' can not be undefined in a subtraction expression");
+
uint32_t Value = SD->getFragment()->getAddress() + SD->getOffset();
uint32_t Value2 = 0;
if (const MCSymbol *B = Target.getSymB()) {
- Type = RIT_LocalDifference;
-
MCSymbolData *SD = SymbolMap.lookup(B);
+
+ if (!SD->getFragment())
+ llvm_report_error("symbol '" + B->getName() +
+ "' can not be undefined in a subtraction expression");
+
+ Type = RIT_LocalDifference;
Value2 = SD->getFragment()->getAddress() + SD->getOffset();
}
OpenPOWER on IntegriCloud