From 90d825be708cd09ab7bfbb6b7a10a98a9847c7c4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 25 Jul 2023 16:49:54 +0200 Subject: Reapply [ConstantFold] Avoid creation of undesirable binop This was reverted together with another commit due to a test conflict. Reapply without functional changes. ----- When commuting the operands, don't create a constant expression for undesirable binops. Only invoke the constant folding function in that case. --- llvm/lib/IR/ConstantFold.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'llvm/lib/IR/ConstantFold.cpp') diff --git a/llvm/lib/IR/ConstantFold.cpp b/llvm/lib/IR/ConstantFold.cpp index 4c33250..db1a83b 100644 --- a/llvm/lib/IR/ConstantFold.cpp +++ b/llvm/lib/IR/ConstantFold.cpp @@ -1084,7 +1084,9 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode, Constant *C1, } else if (isa(C1)) { // If C1 is a ConstantInt and C2 is not, swap the operands. if (Instruction::isCommutative(Opcode)) - return ConstantExpr::get(Opcode, C2, C1); + return ConstantExpr::isDesirableBinOp(Opcode) + ? ConstantExpr::get(Opcode, C2, C1) + : ConstantFoldBinaryInstruction(Opcode, C2, C1); } if (ConstantInt *CI1 = dyn_cast(C1)) { -- cgit v1.1