commit 80a2161338491b32adf91796bc0c57efe92e6362
author Nikita Popov <npopov@redhat.com> Fri Sep 29 11:48:59 2023 +0200
committer Copybara-Service <copybara-worker@google.com> Fri Sep 29 02:56:52 2023 -0700
tree 635048a1cfcac562136735aa2386fcbb9d42ad7f
parent 1ed5f8a22a48c536adac37518224e72688b0c961

[ValueTracking] Avoid use of ConstantExpr::getCast()

Use the constant folding API instead.

GitOrigin-RevId: 74ab4937c1ed2f156606f620b5eed758492673c7

lib/Analysis/ValueTracking.cpp

diff --git a/lib/Analysis/ValueTracking.cpp b/lib/Analysis/ValueTracking.cpp
index d93e030..0736ef6 100644
--- a/lib/Analysis/ValueTracking.cpp
+++ b/lib/Analysis/ValueTracking.cpp
@@ -7834,6 +7834,7 @@
   if (!C)
     return nullptr;
 
+  const DataLayout &DL = CmpI->getModule()->getDataLayout();
   Constant *CastedTo = nullptr;
   switch (*CastOp) {
   case Instruction::ZExt:
@@ -7871,7 +7872,8 @@
       // CmpConst == C is checked below.
       CastedTo = CmpConst;
     } else {
-      CastedTo = ConstantExpr::getIntegerCast(C, SrcTy, CmpI->isSigned());
+      unsigned ExtOp = CmpI->isSigned() ? Instruction::SExt : Instruction::ZExt;
+      CastedTo = ConstantFoldCastOperand(ExtOp, C, SrcTy, DL);
     }
     break;
   case Instruction::FPTrunc:
@@ -7901,8 +7903,8 @@
 
   // Make sure the cast doesn't lose any information.
   Constant *CastedBack =
-      ConstantExpr::getCast(*CastOp, CastedTo, C->getType(), true);
-  if (CastedBack != C)
+      ConstantFoldCastOperand(*CastOp, CastedTo, C->getType(), DL);
+  if (CastedBack && CastedBack != C)
     return nullptr;
 
   return CastedTo;