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
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 @@
// 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().