Skip to content

Commit 101aaf6

Browse files
LebedevRILebedevRI
committed
Revert "[NFC] IRBuilderBase::CreateAdd(): place constant onto RHS"
Clang OpenMP codegen tests are failing, will recommit afterwards. This reverts commit 4723c9b.
1 parent 4271269 commit 101aaf6

35 files changed

+113
-115
lines changed

‎clang/test/CodeGen/builtins-overflow.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ int test_mixed_sign_mull_overflow(int x, unsigned y) {
484484
// CHECK-NEXT: [[UnsignedOFlow:%.*]] = extractvalue { i32, i1 } %{{.*}}, 1
485485
// CHECK-NEXT: [[UnsignedResult:%.*]] = extractvalue { i32, i1 } %{{.*}}, 0
486486
// CHECK-NEXT: [[IsNegZext:%.*]] = zext i1 [[IsNeg]] to i32
487-
// CHECK-NEXT: [[MaxResult:%.*]] = add i32 [[IsNegZext]], 2147483647
487+
// CHECK-NEXT: [[MaxResult:%.*]] = add i32 2147483647, [[IsNegZext]]
488488
// CHECK-NEXT: [[SignedOFlow:%.*]] = icmp ugt i32 [[UnsignedResult]], [[MaxResult]]
489489
// CHECK-NEXT: [[OFlow:%.*]] = or i1 [[UnsignedOFlow]], [[SignedOFlow]]
490490
// CHECK-NEXT: [[NegativeResult:%.*]] = sub i32 0, [[UnsignedResult]]
@@ -523,7 +523,7 @@ int test_mixed_sign_mull_overflow_unsigned(int x, unsigned y) {
523523
int test_mixed_sign_mull_overflow_swapped(int x, unsigned y) {
524524
// CHECK: @test_mixed_sign_mull_overflow_swapped
525525
// CHECK: call { i32, i1 } @llvm.umul.with.overflow.i32
526-
// CHECK: add i32 [[Op0:%.*]], 2147483647
526+
// CHECK: add i32 2147483647
527527
int result;
528528
if (__builtin_mul_overflow(y, x, &result))
529529
return LongErrorCode;
@@ -533,7 +533,7 @@ int test_mixed_sign_mull_overflow_swapped(int x, unsigned y) {
533533
long long test_mixed_sign_mulll_overflow(long long x, unsigned long long y) {
534534
// CHECK: @test_mixed_sign_mulll_overflow
535535
// CHECK: call { i64, i1 } @llvm.umul.with.overflow.i64
536-
// CHECK: add i64 [[Op0:%.*]], 92233720368547
536+
// CHECK: add i64 92233720368547
537537
long long result;
538538
if (__builtin_mul_overflow(x, y, &result))
539539
return LongLongErrorCode;
@@ -543,7 +543,7 @@ long long test_mixed_sign_mulll_overflow(long long x, unsigned long long y) {
543543
long long test_mixed_sign_mulll_overflow_swapped(long long x, unsigned long long y) {
544544
// CHECK: @test_mixed_sign_mulll_overflow_swapped
545545
// CHECK: call { i64, i1 } @llvm.umul.with.overflow.i64
546-
// CHECK: add i64 [[Op0:%.*]], 92233720368547
546+
// CHECK: add i64 92233720368547
547547
long long result;
548548
if (__builtin_mul_overflow(y, x, &result))
549549
return LongLongErrorCode;
@@ -553,7 +553,7 @@ long long test_mixed_sign_mulll_overflow_swapped(long long x, unsigned long long
553553
long long test_mixed_sign_mulll_overflow_trunc_signed(long long x, unsigned long long y) {
554554
// CHECK: @test_mixed_sign_mulll_overflow_trunc_signed
555555
// CHECK: call { i64, i1 } @llvm.umul.with.overflow.i64
556-
// CHECK: add i64 [[Op0:%.*]], 2147483647
556+
// CHECK: add i64 2147483647
557557
// CHECK: trunc
558558
// CHECK: store
559559
int result;

‎clang/test/CodeGen/builtins-ppc-p10vector.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,7 @@ vector double test_vec_vec_splatid(void) {
13731373
vector signed int test_vec_vec_splati_ins_si(void) {
13741374
// CHECK-BE: [[T0:%.+]] = and i32 %{{.+}}, 1
13751375
// CHECK-BE: insertelement <4 x i32> %{{.+}}, i32 %{{.+}}, i32 %{{.+}}
1376-
// CHECK-BE: [[T1:%.+]] = add i32 %{{.+}}, 2
1376+
// CHECK-BE: [[T1:%.+]] = add i32 2, %{{.+}}
13771377
// CHECK-BE: insertelement <4 x i32> %{{.+}}, i32 %{{.+}}, i32 [[T1]]
13781378
// CHECK-BE: ret <4 x i32>
13791379
// CHECK-LE: [[T0:%.+]] = and i32 %{{.+}}, 1
@@ -1388,7 +1388,7 @@ vector signed int test_vec_vec_splati_ins_si(void) {
13881388
vector unsigned int test_vec_vec_splati_ins_ui(void) {
13891389
// CHECK-BE: [[T0:%.+]] = and i32 %{{.+}}, 1
13901390
// CHECK-BE: insertelement <4 x i32> %{{.+}}, i32 %{{.+}}, i32 %{{.+}}
1391-
// CHECK-BE: [[T1:%.+]] = add i32 %{{.+}}, 2
1391+
// CHECK-BE: [[T1:%.+]] = add i32 2, %{{.+}}
13921392
// CHECK-BE: insertelement <4 x i32> %{{.+}}, i32 %{{.+}}, i32 [[T1]]
13931393
// CHECK-BE: ret <4 x i32>
13941394
// CHECK-LE: [[T0:%.+]] = and i32 %{{.+}}, 1
@@ -1403,7 +1403,7 @@ vector unsigned int test_vec_vec_splati_ins_ui(void) {
14031403
vector float test_vec_vec_splati_ins_f(void) {
14041404
// CHECK-BE: [[T0:%.+]] = and i32 %{{.+}}, 1
14051405
// CHECK-BE: insertelement <4 x float> %{{.+}}, float %{{.+}}, i32 %{{.+}}
1406-
// CHECK-BE: [[T1:%.+]] = add i32 %{{.+}}, 2
1406+
// CHECK-BE: [[T1:%.+]] = add i32 2, %{{.+}}
14071407
// CHECK-BE: insertelement <4 x float> %{{.+}}, float %{{.+}}, i32 [[T1]]
14081408
// CHECK-BE: ret <4 x float>
14091409
// CHECK-LE: [[T0:%.+]] = and i32 %{{.+}}, 1
@@ -1415,13 +1415,13 @@ vector float test_vec_vec_splati_ins_f(void) {
14151415
return vec_splati_ins(vfa, 0, 1.0f);
14161416
}
14171417

1418-
// In this test case, the second argument of vec_splati_ins is outside of the
1419-
// expected range [0,1]. A mask of 0x01 is applied to obtain an in-range value
1418+
// In this test case, the second argument of vec_splati_ins is outside of the
1419+
// expected range [0,1]. A mask of 0x01 is applied to obtain an in-range value
14201420
// for the second argument.
14211421
vector signed int test_vec_vec_splati_ins_range(void) {
14221422
// CHECK-BE: [[T0:%.+]] = and i32 %{{.+}}, 1
14231423
// CHECK-BE: insertelement <4 x i32> %{{.+}}, i32 %{{.+}}, i32 %{{.+}}
1424-
// CHECK-BE: [[T1:%.+]] = add i32 %{{.+}}, 2
1424+
// CHECK-BE: [[T1:%.+]] = add i32 2, %{{.+}}
14251425
// CHECK-BE: insertelement <4 x i32> %{{.+}}, i32 %{{.+}}, i32 [[T1]]
14261426
// CHECK-BE: ret <4 x i32>
14271427
// CHECK-LE: [[T0:%.+]] = and i32 %{{.+}}, 1

‎clang/test/CodeGen/catch-nullptr-and-nonzero-offset.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ char *nullptr_var(unsigned long offset) {
170170
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_AGGREGATE:.*]] = call { i64, i1 } @llvm.smul.with.overflow.i64(i64 1, i64 %[[OFFSET_RELOADED]]), !nosanitize
171171
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_OVERFLOWED:.*]] = extractvalue { i64, i1 } %[[COMPUTED_OFFSET_AGGREGATE]], 1, !nosanitize
172172
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET:.*]] = extractvalue { i64, i1 } %[[COMPUTED_OFFSET_AGGREGATE]], 0, !nosanitize
173-
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP:.*]] = add i64 %[[COMPUTED_OFFSET]], 0, !nosanitize
173+
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP:.*]] = add i64 0, %[[COMPUTED_OFFSET]], !nosanitize
174174
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP_IS_NOT_NULL:.*]] = icmp ne i64 %[[COMPUTED_GEP]], 0, !nosanitize
175175
// CHECK-SANITIZE-CPP-NEXT: %[[BOTH_POINTERS_ARE_NULL_OR_BOTH_ARE_NONNULL:.*]] = icmp eq i1 false, %[[COMPUTED_GEP_IS_NOT_NULL]], !nosanitize
176176
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_DID_NOT_OVERFLOW:.*]] = xor i1 %[[COMPUTED_OFFSET_OVERFLOWED]], true, !nosanitize
@@ -256,7 +256,7 @@ char *one_var(unsigned long offset) {
256256
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_AGGREGATE:.*]] = call { i64, i1 } @llvm.smul.with.overflow.i64(i64 1, i64 %[[OFFSET_RELOADED]]), !nosanitize
257257
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_OVERFLOWED:.*]] = extractvalue { i64, i1 } %[[COMPUTED_OFFSET_AGGREGATE]], 1, !nosanitize
258258
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET:.*]] = extractvalue { i64, i1 } %[[COMPUTED_OFFSET_AGGREGATE]], 0, !nosanitize
259-
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP:.*]] = add i64 %[[COMPUTED_OFFSET]], 1, !nosanitize
259+
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP:.*]] = add i64 1, %[[COMPUTED_OFFSET]], !nosanitize
260260
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP_IS_NOT_NULL:.*]] = icmp ne i64 %[[COMPUTED_GEP]], 0, !nosanitize
261261
// CHECK-SANITIZE-C-NEXT: %[[BOTH_POINTERS_ARE_NULL_OR_BOTH_ARE_NONNULL:.*]] = and i1 %[[COMPUTED_GEP_IS_NOT_NULL]], icmp ne (i8* inttoptr (i64 1 to i8*), i8* null), !nosanitize
262262
// CHECK-SANITIZE-CPP-NEXT: %[[BOTH_POINTERS_ARE_NULL_OR_BOTH_ARE_NONNULL:.*]] = icmp eq i1 icmp ne (i8* inttoptr (i64 1 to i8*), i8* null), %[[COMPUTED_GEP_IS_NOT_NULL]], !nosanitize
@@ -342,7 +342,7 @@ char *allones_var(unsigned long offset) {
342342
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_AGGREGATE:.*]] = call { i64, i1 } @llvm.smul.with.overflow.i64(i64 1, i64 %[[OFFSET_RELOADED]]), !nosanitize
343343
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET_OVERFLOWED:.*]] = extractvalue { i64, i1 } %[[COMPUTED_OFFSET_AGGREGATE]], 1, !nosanitize
344344
// CHECK-SANITIZE-NEXT: %[[COMPUTED_OFFSET:.*]] = extractvalue { i64, i1 } %[[COMPUTED_OFFSET_AGGREGATE]], 0, !nosanitize
345-
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP:.*]] = add i64 %[[COMPUTED_OFFSET]], -1, !nosanitize
345+
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP:.*]] = add i64 -1, %[[COMPUTED_OFFSET]], !nosanitize
346346
// CHECK-SANITIZE-NEXT: %[[COMPUTED_GEP_IS_NOT_NULL:.*]] = icmp ne i64 %[[COMPUTED_GEP]], 0, !nosanitize
347347
// CHECK-SANITIZE-C-NEXT: %[[BOTH_POINTERS_ARE_NULL_OR_BOTH_ARE_NONNULL:.*]] = and i1 %[[COMPUTED_GEP_IS_NOT_NULL]], icmp ne (i8* inttoptr (i64 -1 to i8*), i8* null), !nosanitize
348348
// CHECK-SANITIZE-CPP-NEXT: %[[BOTH_POINTERS_ARE_NULL_OR_BOTH_ARE_NONNULL:.*]] = icmp eq i1 icmp ne (i8* inttoptr (i64 -1 to i8*), i8* null), %[[COMPUTED_GEP_IS_NOT_NULL]], !nosanitize

0 commit comments

Comments
 (0)