[llvm] caa423e - Revert "[InstCombine] Lower infinite combine loop detection thresholds"

[Roman Lebedev via llvm-commits]

Author: Roman Lebedev
Date: 2020-07-09T23:10:42+03:00
New Revision: caa423eef0d128f35ac11ddbce34964caafb61c1

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

LOG: Revert "[InstCombine] Lower infinite combine loop detection thresholds"

And just after 3 days, we have a hit in `InstCombiner::mergeStoreIntoSuccessor()`:
https://bugs.llvm.org/show_bug.cgi?id=46661

To be recommitted once that is addressed.

This reverts commit cd7f8051ac7b6f08734102446482c1e5d951bfcc.

Added: 
    

Modified: 
    llvm/lib/Transforms/InstCombine/InstructionCombining.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index e810b3de25bc..d1c1e5418825 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -123,13 +123,8 @@ STATISTIC(NumReassoc  , "Number of reassociations");
 DEBUG_COUNTER(VisitCounter, "instcombine-visit",
               "Controls which instructions are visited");
 
-// FIXME: these limits eventually should be as low as 2.
 static constexpr unsigned InstCombineDefaultMaxIterations = 1000;
-#ifndef NDEBUG
-static constexpr unsigned InstCombineDefaultInfiniteLoopThreshold = 100;
-#else
 static constexpr unsigned InstCombineDefaultInfiniteLoopThreshold = 1000;
-#endif
 
 static cl::opt<bool>
 EnableCodeSinking("instcombine-code-sinking", cl::desc("Enable code sinking"),