summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-10-16 01:33:57 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-10-16 01:33:57 +0000
commit7c3600de949347bf5ea6369b2546fac15bd96415 (patch)
treed2a049c3da31b24724b050bb5da1c338768ffb31 /lib
parente579849652f2ba062e6c91a3af4d9a3843411b44 (diff)
downloadllvm-7c3600de949347bf5ea6369b2546fac15bd96415.tar.gz
llvm-7c3600de949347bf5ea6369b2546fac15bd96415.tar.bz2
llvm-7c3600de949347bf5ea6369b2546fac15bd96415.tar.xz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/MC/MCExpr.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 4c92bbb0a5..d6e545fa78 100644
--- a/lib/MC/MCExpr.cpp
+++ b/lib/MC/MCExpr.cpp
@@ -181,8 +181,11 @@ bool MCExpr::EvaluateAsRelocatable(MCContext &Ctx, MCValue &Res) const {
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;
}