commit 6b01b880129e8102e87b1302315f1a3f7b73a387
author Nirav Dave <niravd@google.com> Fri Apr 27 16:16:06 2018 +0000
committer Nirav Dave <niravd@google.com> Fri Apr 27 16:16:06 2018 +0000
tree fc2353d7fc0abccc3124d97d094bd73b41c24f45
parent c3c767bf505ed825a2d90d24560fe7e305cb2ff5

[MC] Undo spurious commit added into r331052.

llvm-svn: 331055

llvm/lib/MC/MCExpr.cpp

diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index 1242e3d..65fbe8e 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -440,10 +440,6 @@
   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,
@@ -497,7 +493,7 @@
     return;
 
   if (SA.getFragment() == SB.getFragment() && !SA.isVariable() &&
-      !SA.isUnset() && !SB.isVariable() && !SB.isUnset()) {
+      !SB.isVariable()) {
     Addend += (SA.getOffset() - SB.getOffset());
 
     // Pointers to Thumb symbols need to have their low-bit set to allow