aboutsummaryrefslogtreecommitdiffstats
path: root/lib/MC
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-03-25 01:03:17 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-03-25 01:03:17 +0000
commite9cfd685f5916a45e7cd36e51191cec16b02189d (patch)
treef68a7f332cf2e31869efca05de5758e62257e71c /lib/MC
parent48f2cb926e2512a1c4c33ca5a9e757de1c12036c (diff)
downloadexternal_llvm-e9cfd685f5916a45e7cd36e51191cec16b02189d.zip
external_llvm-e9cfd685f5916a45e7cd36e51191cec16b02189d.tar.gz
external_llvm-e9cfd685f5916a45e7cd36e51191cec16b02189d.tar.bz2
MC: Fix refacto in MCExpr evaluation, I mistakenly replaced a fragment address with a symbol address.
- This fixes the integrated-as nightly test regressions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99466 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC')
-rw-r--r--lib/MC/MCExpr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 1d6a316..8ff24d9 100644
--- a/lib/MC/MCExpr.cpp
+++ b/lib/MC/MCExpr.cpp
@@ -268,8 +268,8 @@ bool MCExpr::EvaluateAsRelocatable(MCValue &Res,
Layout->getAssembler().getSymbolData(Res.getSymA()->getSymbol());
MCSymbolData &B =
Layout->getAssembler().getSymbolData(Res.getSymB()->getSymbol());
- Res = MCValue::get(+ Layout->getSymbolAddress(&A) + A.getOffset()
- - Layout->getSymbolAddress(&B) - B.getOffset()
+ Res = MCValue::get(+ Layout->getSymbolAddress(&A)
+ - Layout->getSymbolAddress(&B)
+ Res.getConstant());
}