diff options
| author | Nirav Dave <niravd@google.com> | 2018-04-27 16:11:24 +0000 |
|---|---|---|
| committer | Nirav Dave <niravd@google.com> | 2018-04-27 16:11:24 +0000 |
| commit | 38b4b54a2cd4ff0f41a62dd93e9c340922f0a64f (patch) | |
| tree | 7125fb361bf048e59ca06cb0830b978aa954b516 /llvm/lib/MC/MCExpr.cpp | |
| parent | b2aa89c9092cadaa4b865ec95eb93d43029ded04 (diff) | |
| download | bcm5719-llvm-38b4b54a2cd4ff0f41a62dd93e9c340922f0a64f.tar.gz bcm5719-llvm-38b4b54a2cd4ff0f41a62dd93e9c340922f0a64f.zip | |
[MC] Provide default value for IsResolved.
llvm-svn: 331052
Diffstat (limited to 'llvm/lib/MC/MCExpr.cpp')
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 65fbe8e8428..1242e3d3648 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/lib/MC/MCExpr.cpp @@ -440,6 +440,10 @@ bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler &Asm) const { return evaluateAsAbsolute(Res, &Asm, nullptr, nullptr); } +bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm) const { + return evaluateAsAbsolute(Res, Asm, nullptr, nullptr); +} + bool MCExpr::evaluateKnownAbsolute(int64_t &Res, const MCAsmLayout &Layout) const { return evaluateAsAbsolute(Res, &Layout.getAssembler(), &Layout, nullptr, @@ -493,7 +497,7 @@ static void AttemptToFoldSymbolOffsetDifference( return; if (SA.getFragment() == SB.getFragment() && !SA.isVariable() && - !SB.isVariable()) { + !SA.isUnset() && !SB.isVariable() && !SB.isUnset()) { Addend += (SA.getOffset() - SB.getOffset()); // Pointers to Thumb symbols need to have their low-bit set to allow |
