Use DIExpression::foldConstantMath() at the result of an AppendOpsToArg()

Author: rastogishubham

llvm/lib/IR/DebugInfoMetadata.cpp

@@ -1782,7 +1782,7 @@ DIExpression *DIExpression::appendOpsToArg(const DIExpression *Expr,
   if (StackValue)
     NewOps.push_back(dwarf::DW_OP_stack_value);
 
-  return DIExpression::get(Expr->getContext(), NewOps);
+  return DIExpression::get(Expr->getContext(), NewOps)->foldConstantMath();
 }
 
 DIExpression *DIExpression::replaceArg(const DIExpression *Expr,

llvm/unittests/IR/MetadataTest.cpp

@@ -3409,6 +3409,9 @@ TEST_F(DIExpressionTest, Append) {
         dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_constu, 5, dwarf::DW_OP_plus};
     auto *ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    auto *AppendToArgExpr =
+        DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_plus_uconst, <const>} to a DW_OP_plus
     // expression uint64_t PlusUConstOps[] = {dwarf::DW_OP_plus_uconst, 3};
@@ -3423,6 +3426,8 @@ TEST_F(DIExpressionTest, Append) {
     OpsRes.push_back(5);
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, 0, DW_OP_plus} to an expression
     AppendOps[0] = dwarf::DW_OP_constu;
@@ -3434,27 +3439,35 @@ TEST_F(DIExpressionTest, Append) {
     OpsRes.push_back(dwarf::DW_OP_plus);
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, 0, DW_OP_minus} to an expression 
     AppendOps[2] = dwarf::DW_OP_minus; 
     AppendExpr = DIExpression::append(Expr, AppendOps); 
     OpsRes[3] = Ops[3]; 
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, 0, DW_OP_shl} to an expression
     AppendOps[2] = dwarf::DW_OP_shl;
     AppendExpr = DIExpression::append(Expr, AppendOps);
     OpsRes[3] = Ops[3];
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, 0, DW_OP_shr} to an expression
     AppendOps[2] = dwarf::DW_OP_shr;
     AppendExpr = DIExpression::append(Expr, AppendOps);
     OpsRes[3] = Ops[3];
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, <const>, DW_OP_mul} to a DW_OP_mul expression
     Ops[4] = dwarf::DW_OP_mul;
@@ -3466,13 +3479,17 @@ TEST_F(DIExpressionTest, Append) {
     OpsRes[4] = dwarf::DW_OP_mul;
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, 1, DW_OP_mul} to an expression
     AppendOps[1] = 1;
     AppendExpr = DIExpression::append(Expr, AppendOps);
     OpsRes[3] = Ops[3];
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 
     // Test appending a {dwarf::DW_OP_constu, 1, DW_OP_div} to an expression
     AppendOps[1] = 1;
@@ -3481,6 +3498,8 @@ TEST_F(DIExpressionTest, Append) {
     OpsRes[3] = Ops[3];
     ResExpr = DIExpression::get(Context, OpsRes);
     EXPECT_EQ(ResExpr, AppendExpr);
+    AppendToArgExpr = DIExpression::appendOpsToArg(Expr, AppendOps, 0, false);
+    EXPECT_EQ(ResExpr, AppendToArgExpr);
 }
 
 TEST_F(DIExpressionTest, isValid) {