From b5a3ec17a4600b0e99bd0f4578e7639cfe46ba5a Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Thu, 30 Sep 2010 16:42:21 +0000 Subject: [PATCH] Changes EvaluateAsAbsolute() to return the "current value" of the expression if we are given a Layout object, even in cases when the value is not fixed. This will be needed by the final patch for the dwarf .loc support to size a new MCDwarf fragment needed to build and emit dwarf line number tables. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115155 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCExpr.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp index ddd82f3f622..e9a6062fe7d 100644 --- a/lib/MC/MCExpr.cpp +++ b/lib/MC/MCExpr.cpp @@ -215,8 +215,23 @@ bool MCExpr::EvaluateAsAbsolute(int64_t &Res, const MCAsmLayout *Layout) const { return true; } - if (!EvaluateAsRelocatable(Value, Layout) || !Value.isAbsolute()) + if (!EvaluateAsRelocatable(Value, Layout) || !Value.isAbsolute()) { + // EvaluateAsAbsolute is defined to return the "current value" of + // the expression if we are given a Layout object, even in cases + // when the value is not fixed. + if (Layout) { + Res = Value.getConstant(); + if (Value.getSymA()) { + Res += Layout->getSymbolAddress( + &Layout->getAssembler().getSymbolData(Value.getSymA()->getSymbol())); + } + if (Value.getSymB()) { + Res -= Layout->getSymbolAddress( + &Layout->getAssembler().getSymbolData(Value.getSymB()->getSymbol())); + } + } return false; + } Res = Value.getConstant(); return true; -- 2.34.1