@@ -245,9 +245,9 @@ TEST_F(VPBasicBlockTest, getPlan) {
245
245
{
246
246
VPlan &Plan = getPlan ();
247
247
VPBasicBlock *VPBB1 = Plan.getEntry ();
248
- VPBasicBlock *VPBB2 = new VPBasicBlock ( );
249
- VPBasicBlock *VPBB3 = new VPBasicBlock ( );
250
- VPBasicBlock *VPBB4 = new VPBasicBlock ( );
248
+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock ( " " );
249
+ VPBasicBlock *VPBB3 = Plan. createVPBasicBlock ( " " );
250
+ VPBasicBlock *VPBB4 = Plan. createVPBasicBlock ( " " );
251
251
252
252
// VPBB1
253
253
// / \
@@ -270,8 +270,8 @@ TEST_F(VPBasicBlockTest, getPlan) {
270
270
VPlan &Plan = getPlan ();
271
271
VPBasicBlock *VPBB1 = Plan.getEntry ();
272
272
// VPBasicBlock is the entry into the VPlan, followed by a region.
273
- VPBasicBlock *R1BB1 = new VPBasicBlock ( );
274
- VPBasicBlock *R1BB2 = new VPBasicBlock ( );
273
+ VPBasicBlock *R1BB1 = Plan. createVPBasicBlock ( " " );
274
+ VPBasicBlock *R1BB2 = Plan. createVPBasicBlock ( " " );
275
275
VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB2, " R1" );
276
276
VPBlockUtils::connectBlocks (R1BB1, R1BB2);
277
277
@@ -287,21 +287,21 @@ TEST_F(VPBasicBlockTest, getPlan) {
287
287
288
288
{
289
289
VPlan &Plan = getPlan ();
290
- VPBasicBlock *R1BB1 = new VPBasicBlock ( );
291
- VPBasicBlock *R1BB2 = new VPBasicBlock ( );
290
+ VPBasicBlock *R1BB1 = Plan. createVPBasicBlock ( " " );
291
+ VPBasicBlock *R1BB2 = Plan. createVPBasicBlock ( " " );
292
292
VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB2, " R1" );
293
293
VPBlockUtils::connectBlocks (R1BB1, R1BB2);
294
294
295
- VPBasicBlock *R2BB1 = new VPBasicBlock ( );
296
- VPBasicBlock *R2BB2 = new VPBasicBlock ( );
295
+ VPBasicBlock *R2BB1 = Plan. createVPBasicBlock ( " " );
296
+ VPBasicBlock *R2BB2 = Plan. createVPBasicBlock ( " " );
297
297
VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB2, " R2" );
298
298
VPBlockUtils::connectBlocks (R2BB1, R2BB2);
299
299
300
300
VPBasicBlock *VPBB1 = Plan.getEntry ();
301
301
VPBlockUtils::connectBlocks (VPBB1, R1);
302
302
VPBlockUtils::connectBlocks (VPBB1, R2);
303
303
304
- VPBasicBlock *VPBB2 = new VPBasicBlock ( );
304
+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock ( " " );
305
305
VPBlockUtils::connectBlocks (R1, VPBB2);
306
306
VPBlockUtils::connectBlocks (R2, VPBB2);
307
307
@@ -329,9 +329,9 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
329
329
//
330
330
VPlan &Plan = getPlan ();
331
331
VPBasicBlock *VPBB1 = Plan.getEntry ();
332
- VPBasicBlock *VPBB2 = new VPBasicBlock ( );
333
- VPBasicBlock *VPBB3 = new VPBasicBlock ( );
334
- VPBasicBlock *VPBB4 = new VPBasicBlock ( );
332
+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock ( " " );
333
+ VPBasicBlock *VPBB3 = Plan. createVPBasicBlock ( " " );
334
+ VPBasicBlock *VPBB4 = Plan. createVPBasicBlock ( " " );
335
335
336
336
VPBlockUtils::connectBlocks (VPBB1, VPBB2);
337
337
VPBlockUtils::connectBlocks (VPBB1, VPBB3);
@@ -368,10 +368,10 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
368
368
//
369
369
VPlan &Plan = getPlan ();
370
370
VPBasicBlock *VPBB0 = Plan.getEntry ();
371
- VPBasicBlock *R1BB1 = new VPBasicBlock ( );
372
- VPBasicBlock *R1BB2 = new VPBasicBlock ( );
373
- VPBasicBlock *R1BB3 = new VPBasicBlock ( );
374
- VPBasicBlock *R1BB4 = new VPBasicBlock ( );
371
+ VPBasicBlock *R1BB1 = Plan. createVPBasicBlock ( " " );
372
+ VPBasicBlock *R1BB2 = Plan. createVPBasicBlock ( " " );
373
+ VPBasicBlock *R1BB3 = Plan. createVPBasicBlock ( " " );
374
+ VPBasicBlock *R1BB4 = Plan. createVPBasicBlock ( " " );
375
375
VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB4, " R1" );
376
376
R1BB2->setParent (R1);
377
377
R1BB3->setParent (R1);
@@ -383,8 +383,8 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
383
383
// Cycle.
384
384
VPBlockUtils::connectBlocks (R1BB3, R1BB3);
385
385
386
- VPBasicBlock *R2BB1 = new VPBasicBlock ( );
387
- VPBasicBlock *R2BB2 = new VPBasicBlock ( );
386
+ VPBasicBlock *R2BB1 = Plan. createVPBasicBlock ( " " );
387
+ VPBasicBlock *R2BB2 = Plan. createVPBasicBlock ( " " );
388
388
VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB2, " R2" );
389
389
VPBlockUtils::connectBlocks (R2BB1, R2BB2);
390
390
VPBlockUtils::connectBlocks (R1, R2);
@@ -467,14 +467,17 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
467
467
// VPBB2
468
468
//
469
469
VPlan &Plan = getPlan ();
470
- VPBasicBlock *R1BB1 = new VPBasicBlock (" R1BB1" );
471
- VPBasicBlock *R1BB2 = new VPBasicBlock (" R1BB2" );
472
- VPBasicBlock *R1BB3 = new VPBasicBlock (" R1BB3" );
470
+ VPBasicBlock *R1BB1 = Plan. createVPBasicBlock (" R1BB1" );
471
+ VPBasicBlock *R1BB2 = Plan. createVPBasicBlock (" R1BB2" );
472
+ VPBasicBlock *R1BB3 = Plan. createVPBasicBlock (" R1BB3" );
473
473
VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB3, " R1" );
474
474
475
- VPBasicBlock *R2BB1 = new VPBasicBlock (" R2BB1" );
476
- VPBasicBlock *R2BB2 = new VPBasicBlock (" R2BB2" );
477
- VPBasicBlock *R2BB3 = new VPBasicBlock (" R2BB3" );
475
+ VPBasicBlock *R2BB1 = Plan.createVPBasicBlock (" "
476
+ " R2BB1" );
477
+ VPBasicBlock *R2BB2 = Plan.createVPBasicBlock (" "
478
+ " R2BB2" );
479
+ VPBasicBlock *R2BB3 = Plan.createVPBasicBlock (" "
480
+ " R2BB3" );
478
481
VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB3, " R2" );
479
482
R2BB2->setParent (R2);
480
483
VPBlockUtils::connectBlocks (R2BB1, R2BB2);
@@ -490,7 +493,8 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
490
493
491
494
VPBasicBlock *VPBB1 = Plan.getEntry ();
492
495
VPBlockUtils::connectBlocks (VPBB1, R1);
493
- VPBasicBlock *VPBB2 = new VPBasicBlock (" VPBB2" );
496
+ VPBasicBlock *VPBB2 = Plan.createVPBasicBlock (" "
497
+ " VPBB2" );
494
498
VPBlockUtils::connectBlocks (R1, VPBB2);
495
499
496
500
// Depth-first.
@@ -538,8 +542,8 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
538
542
// }
539
543
//
540
544
VPlan &Plan = getPlan ();
541
- VPBasicBlock *R2BB1 = new VPBasicBlock (" R2BB1" );
542
- VPBasicBlock *R2BB2 = new VPBasicBlock (" R2BB2" );
545
+ VPBasicBlock *R2BB1 = Plan. createVPBasicBlock (" R2BB1" );
546
+ VPBasicBlock *R2BB2 = Plan. createVPBasicBlock (" R2BB2" );
543
547
VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB2, " R2" );
544
548
VPBlockUtils::connectBlocks (R2BB1, R2BB2);
545
549
@@ -592,10 +596,11 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
592
596
// VPBB2
593
597
//
594
598
VPlan &Plan = getPlan ();
595
- VPBasicBlock *R3BB1 = new VPBasicBlock (" R3BB1" );
599
+ VPBasicBlock *R3BB1 = Plan. createVPBasicBlock (" R3BB1" );
596
600
VPRegionBlock *R3 = new VPRegionBlock (R3BB1, R3BB1, " R3" );
597
601
598
- VPBasicBlock *R2BB1 = new VPBasicBlock (" R2BB1" );
602
+ VPBasicBlock *R2BB1 = Plan.createVPBasicBlock (" "
603
+ " R2BB1" );
599
604
VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R3, " R2" );
600
605
R3->setParent (R2);
601
606
VPBlockUtils::connectBlocks (R2BB1, R3);
@@ -604,7 +609,7 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
604
609
R2->setParent (R1);
605
610
606
611
VPBasicBlock *VPBB1 = Plan.getEntry ();
607
- VPBasicBlock *VPBB2 = new VPBasicBlock (" VPBB2" );
612
+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock (" VPBB2" );
608
613
VPBlockUtils::connectBlocks (VPBB1, R1);
609
614
VPBlockUtils::connectBlocks (R1, VPBB2);
610
615
@@ -674,15 +679,15 @@ TEST_F(VPBasicBlockTest, print) {
674
679
VPInstruction *I2 = new VPInstruction (Instruction::Sub, {I1});
675
680
VPInstruction *I3 = new VPInstruction (Instruction::Br, {I1, I2});
676
681
677
- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
682
+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
678
683
VPBB1->appendRecipe (I1);
679
684
VPBB1->appendRecipe (I2);
680
685
VPBB1->appendRecipe (I3);
681
686
VPBB1->setName (" bb1" );
682
687
683
688
VPInstruction *I4 = new VPInstruction (Instruction::Mul, {I2, I1});
684
689
VPInstruction *I5 = new VPInstruction (Instruction::Ret, {I4});
685
- VPBasicBlock *VPBB2 = new VPBasicBlock ( );
690
+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock ( " " );
686
691
VPBB2->appendRecipe (I4);
687
692
VPBB2->appendRecipe (I5);
688
693
VPBB2->setName (" bb2" );
@@ -783,7 +788,7 @@ TEST_F(VPBasicBlockTest, printPlanWithVFsAndUFs) {
783
788
VPBB0->appendRecipe (TC);
784
789
785
790
VPInstruction *I1 = new VPInstruction (Instruction::Add, {});
786
- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
791
+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
787
792
VPBB1->appendRecipe (I1);
788
793
VPBB1->setName (" bb1" );
789
794
@@ -1238,7 +1243,7 @@ TEST_F(VPRecipeTest, MayHaveSideEffectsAndMayReadWriteMemory) {
1238
1243
TEST_F (VPRecipeTest, dumpRecipeInPlan) {
1239
1244
VPlan &Plan = getPlan ();
1240
1245
VPBasicBlock *VPBB0 = Plan.getEntry ();
1241
- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
1246
+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
1242
1247
VPBlockUtils::connectBlocks (VPBB1, Plan.getScalarHeader ());
1243
1248
VPBlockUtils::connectBlocks (VPBB0, VPBB1);
1244
1249
@@ -1307,7 +1312,7 @@ TEST_F(VPRecipeTest, dumpRecipeInPlan) {
1307
1312
TEST_F (VPRecipeTest, dumpRecipeUnnamedVPValuesInPlan) {
1308
1313
VPlan &Plan = getPlan ();
1309
1314
VPBasicBlock *VPBB0 = Plan.getEntry ();
1310
- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
1315
+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
1311
1316
VPBlockUtils::connectBlocks (VPBB1, Plan.getScalarHeader ());
1312
1317
VPBlockUtils::connectBlocks (VPBB0, VPBB1);
1313
1318
0 commit comments