commit 7c3600de949347bf5ea6369b2546fac15bd96415
author Daniel Dunbar <daniel@zuster.org> Fri Oct 16 01:33:57 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Fri Oct 16 01:33:57 2009 +0000
tree d2a049c3da31b24724b050bb5da1c338768ffb31
parent e579849652f2ba062e6c91a3af4d9a3843411b44

MC: Move assembler variable values from MCContext to MCSymbol.

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

lib/MC/MCExpr.cpp

diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 4c92bbb..d6e545f 100644
--- a/lib/MC/MCExpr.cpp
+++ b/lib/MC/MCExpr.cpp
@@ -181,8 +181,11 @@
 
   case SymbolRef: {
     const MCSymbol &Sym = cast<MCSymbolRefExpr>(this)->getSymbol();
-    if (const MCExpr *Value = Ctx.GetSymbolValue(&Sym))
-      return Value->EvaluateAsRelocatable(Ctx, Res);
+
+    // Evaluate recursively if this is a variable.
+    if (Sym.isVariable())
+      return Sym.getValue()->EvaluateAsRelocatable(Ctx, Res);
+
     Res = MCValue::get(&Sym, 0, 0);
     return true;
   }