From 10b6d33581400ec1a0c09f7719ccc3dc1903c27d Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 22 Dec 2010 22:16:24 +0000 Subject: Add r122359 back now that the bug in MCDwarfLineAddrFragment fragment has been fixed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122448 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCExpr.cpp | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'lib/MC/MCExpr.cpp') diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp index 8fdf837..58f2e94 100644 --- a/lib/MC/MCExpr.cpp +++ b/lib/MC/MCExpr.cpp @@ -269,27 +269,13 @@ bool MCExpr::EvaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm, // FIXME: The use if InSet = Addrs is a hack. Setting InSet causes us // absolutize differences across sections and that is what the MachO writer // uses Addrs for. - if (!EvaluateAsRelocatableImpl(Value, Asm, Layout, Addrs, /*InSet*/ Addrs) || - !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->getSymbolOffset( - &Layout->getAssembler().getSymbolData(Value.getSymA()->getSymbol())); - } - if (Value.getSymB()) { - Res -= Layout->getSymbolOffset( - &Layout->getAssembler().getSymbolData(Value.getSymB()->getSymbol())); - } - } - return false; - } + bool IsRelocatable = + EvaluateAsRelocatableImpl(Value, Asm, Layout, Addrs, /*InSet*/ Addrs); + // Record the current value. Res = Value.getConstant(); - return true; + + return IsRelocatable && Value.isAbsolute(); } /// \brief Helper method for \see EvaluateSymbolAdd(). -- cgit v1.1