diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-03-14 03:10:40 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-03-14 03:10:40 +0000 |
| commit | aa8f95eb56086d8b82417f50a52e0055eaf4ebff (patch) | |
| tree | 22c796922d4ed6a39385e2bc3c70bb5979c4320d /llvm | |
| parent | ee2fbbc978aa29a0196ea522adb947a8f86dde4a (diff) | |
| download | bcm5719-llvm-aa8f95eb56086d8b82417f50a52e0055eaf4ebff.tar.gz bcm5719-llvm-aa8f95eb56086d8b82417f50a52e0055eaf4ebff.zip | |
MC: Fix a crash on invalid, attempting to evaluate undefined symbols.
llvm-svn: 98464
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 7 | ||||
| -rw-r--r-- | llvm/lib/MC/MCMachOStreamer.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 8d84f53037d..3bd6b1b6950 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/lib/MC/MCExpr.cpp @@ -195,10 +195,11 @@ bool MCExpr::EvaluateAsRelocatable(MCValue &Res, if (!Sym.getValue()->EvaluateAsRelocatable(Res, Layout)) return false; - // Absolutize symbol differences when we have a layout object and the - // target requests it. + // Absolutize symbol differences between defined symbols when we have a + // layout object and the target requests it. if (Layout && Res.getSymB() && - Layout->getAssembler().getBackend().hasAbsolutizedSet()) { + Layout->getAssembler().getBackend().hasAbsolutizedSet() && + Res.getSymA()->isDefined() && Res.getSymB()->isDefined()) { MCSymbolData &A = Layout->getAssembler().getSymbolData(*Res.getSymA()); MCSymbolData &B = Layout->getAssembler().getSymbolData(*Res.getSymB()); Res = MCValue::get(+ A.getFragment()->getAddress() + A.getOffset() diff --git a/llvm/lib/MC/MCMachOStreamer.cpp b/llvm/lib/MC/MCMachOStreamer.cpp index 2d833ba351f..73b1074531d 100644 --- a/llvm/lib/MC/MCMachOStreamer.cpp +++ b/llvm/lib/MC/MCMachOStreamer.cpp @@ -184,7 +184,7 @@ void MCMachOStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) { // FIXME: Lift context changes into super class. // FIXME: Set associated section. - Symbol->setValue(Value); + Symbol->setValue(AddValueSymbols(Value)); } void MCMachOStreamer::EmitSymbolAttribute(MCSymbol *Symbol, |
