commit 42712698fddba427a56bd9c749310cd9d8900c3b
author Roman Lebedev <lebedev.ri@gmail.com> Wed Oct 27 22:19:10 2021 +0300
committer Roman Lebedev <lebedev.ri@gmail.com> Wed Oct 27 22:21:37 2021 +0300
tree e44a6f06508e61044d76c2c7eb4cc2c7b9bf2399
parent ea7be26045e2f4fbf0a3ceb8842b024e3eb6e8a5

Revert "[IR] `IRBuilderBase::CreateAdd()`: short-circuit `x + 0` --> `x`"

Clang OpenMP codegen tests are failing.

This reverts commit 288f1f8abe5835180a0021f142043ee261ab3846.
This reverts commit cb90e5356ac1594e95fed8e208d6e0e9b6a87db1.

llvm/unittests/IR/PatternMatch.cpp

diff --git a/llvm/unittests/IR/PatternMatch.cpp b/llvm/unittests/IR/PatternMatch.cpp
index 7023e5a..598dcdf 100644
--- a/llvm/unittests/IR/PatternMatch.cpp
+++ b/llvm/unittests/IR/PatternMatch.cpp
@@ -479,19 +479,19 @@
 }
 
 TEST_F(PatternMatchTest, Unless) {
-  Value *X = IRB.CreateAdd(IRB.getInt32(1), IRB.getInt32(-1));
+  Value *X = IRB.CreateAdd(IRB.getInt32(1), IRB.getInt32(0));
 
-  EXPECT_TRUE(m_Add(m_One(), m_AllOnes()).match(X));
-  EXPECT_FALSE(m_Add(m_AllOnes(), m_One()).match(X));
+  EXPECT_TRUE(m_Add(m_One(), m_Zero()).match(X));
+  EXPECT_FALSE(m_Add(m_Zero(), m_One()).match(X));
 
-  EXPECT_FALSE(m_Unless(m_Add(m_One(), m_AllOnes())).match(X));
-  EXPECT_TRUE(m_Unless(m_Add(m_AllOnes(), m_One())).match(X));
+  EXPECT_FALSE(m_Unless(m_Add(m_One(), m_Zero())).match(X));
+  EXPECT_TRUE(m_Unless(m_Add(m_Zero(), m_One())).match(X));
 
-  EXPECT_TRUE(m_c_Add(m_One(), m_AllOnes()).match(X));
-  EXPECT_TRUE(m_c_Add(m_AllOnes(), m_One()).match(X));
+  EXPECT_TRUE(m_c_Add(m_One(), m_Zero()).match(X));
+  EXPECT_TRUE(m_c_Add(m_Zero(), m_One()).match(X));
 
-  EXPECT_FALSE(m_Unless(m_c_Add(m_One(), m_AllOnes())).match(X));
-  EXPECT_FALSE(m_Unless(m_c_Add(m_AllOnes(), m_One())).match(X));
+  EXPECT_FALSE(m_Unless(m_c_Add(m_One(), m_Zero())).match(X));
+  EXPECT_FALSE(m_Unless(m_c_Add(m_Zero(), m_One())).match(X));
 }
 
 TEST_F(PatternMatchTest, ZExtSExtSelf) {