MC: Fix a crash on invalid, attempting to evaluate undefined symbols.

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

diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 8d84f53037dc368716f6ec2a67b1e096a0a71c74..3bd6b1b6950b9ef7020d21a21548e8ed8d8ddeb0 100644 (file)
--- a/lib/MC/MCExpr.cpp
+++ b/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/lib/MC/MCMachOStreamer.cpp b/lib/MC/MCMachOStreamer.cpp
index 2d833ba351fe2e39f56dc3b628f719a6d571d1e7..73b1074531d17c9ff28b8a68691bcef4d62de4eb 100644 (file)
--- a/lib/MC/MCMachOStreamer.cpp
+++ b/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,