[llvm] 3ce7714 - Revert "[DAG] Fix PR45049: LegalizeTypes crash"

[Jonathan Roelofs via llvm-commits]

Author: Jonathan Roelofs
Date: 2020-04-04T13:47:22-06:00
New Revision: 3ce77142a6452d76d6f97c9a6c2da193e78841ba

URL: https://github.com/llvm/llvm-project/commit/3ce77142a6452d76d6f97c9a6c2da193e78841ba
DIFF: https://github.com/llvm/llvm-project/commit/3ce77142a6452d76d6f97c9a6c2da193e78841ba.diff

LOG: Revert "[DAG] Fix PR45049: LegalizeTypes crash"

This reverts commit 17673ae0b2cbf8d48973b673d413fb8591d8aae7.

Added: 
    

Modified: 
    llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
    llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
    llvm/test/CodeGen/X86/legalize-types-remapid.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
index c4e738e14d43..b10d5355c8f9 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
@@ -178,7 +178,6 @@ void DAGTypeLegalizer::PerformExpensiveChecks() {
     }
   }
 
-#ifndef NDEBUG
   // Checked that NewNodes are only used by other NewNodes.
   for (unsigned i = 0, e = NewNodes.size(); i != e; ++i) {
     SDNode *N = NewNodes[i];
@@ -186,11 +185,6 @@ void DAGTypeLegalizer::PerformExpensiveChecks() {
          UI != UE; ++UI)
       assert(UI->getNodeId() == NewNode && "NewNode used by non-NewNode!");
   }
-
-  // Check that all of the replacements still exist.
-  for (auto const &I : ReplacedValues)
-    assert(IdToValueMap.count(I.second) && "remapped value missing");
-#endif
 }
 
 /// This is the main entry point for the type legalizer. This does a top-down

diff  --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
index f6a732905a26..e27f1e5b3231 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
@@ -159,9 +159,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
   const SDValue &getSDValue(TableId &Id) {
     RemapId(Id);
     assert(Id && "TableId should be non-zero");
-    auto I = IdToValueMap.find(Id);
-    assert(I != IdToValueMap.end() && "cannot find Id in map");
-    return I->second;
+    return IdToValueMap[Id];
   }
 
 public:
@@ -178,30 +176,25 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
   bool run();
 
   void NoteDeletion(SDNode *Old, SDNode *New) {
-    assert(Old != New && "node replaced with self");
     for (unsigned i = 0, e = Old->getNumValues(); i != e; ++i) {
       TableId NewId = getTableId(SDValue(New, i));
       TableId OldId = getTableId(SDValue(Old, i));
 
-      if (OldId != NewId) {
+      if (OldId != NewId)
         ReplacedValues[OldId] = NewId;
 
-        // Delete Node from tables.  We cannot do this when OldId == NewId,
-        // because NewId can still have table references to it in
-        // ReplacedValues.
-        IdToValueMap.erase(OldId);
-        PromotedIntegers.erase(OldId);
-        ExpandedIntegers.erase(OldId);
-        SoftenedFloats.erase(OldId);
-        PromotedFloats.erase(OldId);
-        SoftPromotedHalfs.erase(OldId);
-        ExpandedFloats.erase(OldId);
-        ScalarizedVectors.erase(OldId);
-        SplitVectors.erase(OldId);
-        WidenedVectors.erase(OldId);
-      }
-
+      // Delete Node from tables.
       ValueToIdMap.erase(SDValue(Old, i));
+      IdToValueMap.erase(OldId);
+      PromotedIntegers.erase(OldId);
+      ExpandedIntegers.erase(OldId);
+      SoftenedFloats.erase(OldId);
+      PromotedFloats.erase(OldId);
+      SoftPromotedHalfs.erase(OldId);
+      ExpandedFloats.erase(OldId);
+      ScalarizedVectors.erase(OldId);
+      SplitVectors.erase(OldId);
+      WidenedVectors.erase(OldId);
     }
   }
 

diff  --git a/llvm/test/CodeGen/X86/legalize-types-remapid.ll b/llvm/test/CodeGen/X86/legalize-types-remapid.ll
index 0fc5ee74f416..d24ec2d3b556 100644
--- a/llvm/test/CodeGen/X86/legalize-types-remapid.ll
+++ b/llvm/test/CodeGen/X86/legalize-types-remapid.ll
@@ -14,18 +14,3 @@ bb1:
   store volatile i32 %t0.i0.cast.i1, i32* @c
   ret void
 }
-
-define void @PR45049() local_unnamed_addr {
-so_basic:
-  %a0 = load i1, i1* undef, align 1
-  %a1 = select i1 %a0, i542 4374501449566023848745004454235242730706338861786424872851541212819905998398751846447026354046107648, i542 0 ; constant is: i542 1 << 331
-  %a00 = zext i1 %a0 to i542
-  %a11 = shl i542 %a00, 331
-  %a2 = shl i542 %a00, 330
-  %a4 = or i542 %a1, %a2
-  %a05 = zext i1 %a0 to i488
-  %a55 = shl i488 %a05, 111
-  store i542 %a4, i542* undef, align 8
-  store i488 %a55, i488* undef, align 8
-  ret void
-}