summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC
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
commit17b9027b5c22dc6cde1a7c3c0ce20a830dfd8b67 (patch)
tree0314b61908b9a2bcea67bd69107da67c2df244de /llvm/lib/MC
parent584a1b25ef4e146e8e6ea568946c73e0618a8393 (diff)
downloadbcm5719-llvm-17b9027b5c22dc6cde1a7c3c0ce20a830dfd8b67.tar.gz
bcm5719-llvm-17b9027b5c22dc6cde1a7c3c0ce20a830dfd8b67.zip
MC: Move assembler variable values from MCContext to MCSymbol.
llvm-svn: 84229
Diffstat (limited to 'llvm/lib/MC')
-rw-r--r--llvm/lib/MC/MCExpr.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index 4c92bbb0a50..d6e545fa78c 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud