Revert "[DAG] Integrate findBaseOffset address analyses to BaseIndexOffset. NFCI."

which was causing miscompilations in for some test-suite components.

This reverts commit 3e9de9ff0f3162920a2a3cba51c7dc14b54b4d16.

llvm-svn: 321380

1 files changed, 0 insertions, 17 deletions

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp
index d5980919d03..544da362be6 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp
@@ -37,23 +37,6 @@ bool BaseIndexOffset::equalBaseIndex(BaseIndexOffset &Other,
           return true;
         }
 
-    // Match Constants
-    if (auto *A = dyn_cast<ConstantPoolSDNode>(Base))
-      if (auto *B = dyn_cast<ConstantPoolSDNode>(Other.Base)) {
-        bool IsMatch =
-            A->isMachineConstantPoolEntry() == B->isMachineConstantPoolEntry();
-        if (IsMatch) {
-          if (A->isMachineConstantPoolEntry())
-            IsMatch = A->getMachineCPVal() == B->getMachineCPVal();
-          else
-            IsMatch = A->getConstVal() == B->getConstVal();
-        }
-        if (IsMatch) {
-          Off += B->getOffset() - A->getOffset();
-          return true;
-        }
-      }
-
     const MachineFrameInfo &MFI = DAG.getMachineFunction().getFrameInfo();
 
     // Match non-equal FrameIndexes - If both frame indices are fixed