@@ -245,9 +245,9 @@ TEST_F(VPBasicBlockTest, getPlan) {
245245 {
246246 VPlan &Plan = getPlan ();
247247 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 ( " " );
251251
252252 // VPBB1
253253 // / \
@@ -270,8 +270,8 @@ TEST_F(VPBasicBlockTest, getPlan) {
270270 VPlan &Plan = getPlan ();
271271 VPBasicBlock *VPBB1 = Plan.getEntry ();
272272 // 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 ( " " );
275275 VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB2, " R1" );
276276 VPBlockUtils::connectBlocks (R1BB1, R1BB2);
277277
@@ -287,21 +287,21 @@ TEST_F(VPBasicBlockTest, getPlan) {
287287
288288 {
289289 VPlan &Plan = getPlan ();
290- VPBasicBlock *R1BB1 = new VPBasicBlock ( );
291- VPBasicBlock *R1BB2 = new VPBasicBlock ( );
290+ VPBasicBlock *R1BB1 = Plan. createVPBasicBlock ( " " );
291+ VPBasicBlock *R1BB2 = Plan. createVPBasicBlock ( " " );
292292 VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB2, " R1" );
293293 VPBlockUtils::connectBlocks (R1BB1, R1BB2);
294294
295- VPBasicBlock *R2BB1 = new VPBasicBlock ( );
296- VPBasicBlock *R2BB2 = new VPBasicBlock ( );
295+ VPBasicBlock *R2BB1 = Plan. createVPBasicBlock ( " " );
296+ VPBasicBlock *R2BB2 = Plan. createVPBasicBlock ( " " );
297297 VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB2, " R2" );
298298 VPBlockUtils::connectBlocks (R2BB1, R2BB2);
299299
300300 VPBasicBlock *VPBB1 = Plan.getEntry ();
301301 VPBlockUtils::connectBlocks (VPBB1, R1);
302302 VPBlockUtils::connectBlocks (VPBB1, R2);
303303
304- VPBasicBlock *VPBB2 = new VPBasicBlock ( );
304+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock ( " " );
305305 VPBlockUtils::connectBlocks (R1, VPBB2);
306306 VPBlockUtils::connectBlocks (R2, VPBB2);
307307
@@ -329,9 +329,9 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
329329 //
330330 VPlan &Plan = getPlan ();
331331 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 ( " " );
335335
336336 VPBlockUtils::connectBlocks (VPBB1, VPBB2);
337337 VPBlockUtils::connectBlocks (VPBB1, VPBB3);
@@ -368,10 +368,10 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
368368 //
369369 VPlan &Plan = getPlan ();
370370 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 ( " " );
375375 VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB4, " R1" );
376376 R1BB2->setParent (R1);
377377 R1BB3->setParent (R1);
@@ -383,8 +383,8 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
383383 // Cycle.
384384 VPBlockUtils::connectBlocks (R1BB3, R1BB3);
385385
386- VPBasicBlock *R2BB1 = new VPBasicBlock ( );
387- VPBasicBlock *R2BB2 = new VPBasicBlock ( );
386+ VPBasicBlock *R2BB1 = Plan. createVPBasicBlock ( " " );
387+ VPBasicBlock *R2BB2 = Plan. createVPBasicBlock ( " " );
388388 VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB2, " R2" );
389389 VPBlockUtils::connectBlocks (R2BB1, R2BB2);
390390 VPBlockUtils::connectBlocks (R1, R2);
@@ -467,14 +467,17 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
467467 // VPBB2
468468 //
469469 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" );
473473 VPRegionBlock *R1 = new VPRegionBlock (R1BB1, R1BB3, " R1" );
474474
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" );
478481 VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB3, " R2" );
479482 R2BB2->setParent (R2);
480483 VPBlockUtils::connectBlocks (R2BB1, R2BB2);
@@ -490,7 +493,8 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
490493
491494 VPBasicBlock *VPBB1 = Plan.getEntry ();
492495 VPBlockUtils::connectBlocks (VPBB1, R1);
493- VPBasicBlock *VPBB2 = new VPBasicBlock (" VPBB2" );
496+ VPBasicBlock *VPBB2 = Plan.createVPBasicBlock (" "
497+ " VPBB2" );
494498 VPBlockUtils::connectBlocks (R1, VPBB2);
495499
496500 // Depth-first.
@@ -538,8 +542,8 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
538542 // }
539543 //
540544 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" );
543547 VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R2BB2, " R2" );
544548 VPBlockUtils::connectBlocks (R2BB1, R2BB2);
545549
@@ -592,10 +596,11 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
592596 // VPBB2
593597 //
594598 VPlan &Plan = getPlan ();
595- VPBasicBlock *R3BB1 = new VPBasicBlock (" R3BB1" );
599+ VPBasicBlock *R3BB1 = Plan. createVPBasicBlock (" R3BB1" );
596600 VPRegionBlock *R3 = new VPRegionBlock (R3BB1, R3BB1, " R3" );
597601
598- VPBasicBlock *R2BB1 = new VPBasicBlock (" R2BB1" );
602+ VPBasicBlock *R2BB1 = Plan.createVPBasicBlock (" "
603+ " R2BB1" );
599604 VPRegionBlock *R2 = new VPRegionBlock (R2BB1, R3, " R2" );
600605 R3->setParent (R2);
601606 VPBlockUtils::connectBlocks (R2BB1, R3);
@@ -604,7 +609,7 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
604609 R2->setParent (R1);
605610
606611 VPBasicBlock *VPBB1 = Plan.getEntry ();
607- VPBasicBlock *VPBB2 = new VPBasicBlock (" VPBB2" );
612+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock (" VPBB2" );
608613 VPBlockUtils::connectBlocks (VPBB1, R1);
609614 VPBlockUtils::connectBlocks (R1, VPBB2);
610615
@@ -674,15 +679,15 @@ TEST_F(VPBasicBlockTest, print) {
674679 VPInstruction *I2 = new VPInstruction (Instruction::Sub, {I1});
675680 VPInstruction *I3 = new VPInstruction (Instruction::Br, {I1, I2});
676681
677- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
682+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
678683 VPBB1->appendRecipe (I1);
679684 VPBB1->appendRecipe (I2);
680685 VPBB1->appendRecipe (I3);
681686 VPBB1->setName (" bb1" );
682687
683688 VPInstruction *I4 = new VPInstruction (Instruction::Mul, {I2, I1});
684689 VPInstruction *I5 = new VPInstruction (Instruction::Ret, {I4});
685- VPBasicBlock *VPBB2 = new VPBasicBlock ( );
690+ VPBasicBlock *VPBB2 = Plan. createVPBasicBlock ( " " );
686691 VPBB2->appendRecipe (I4);
687692 VPBB2->appendRecipe (I5);
688693 VPBB2->setName (" bb2" );
@@ -783,7 +788,7 @@ TEST_F(VPBasicBlockTest, printPlanWithVFsAndUFs) {
783788 VPBB0->appendRecipe (TC);
784789
785790 VPInstruction *I1 = new VPInstruction (Instruction::Add, {});
786- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
791+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
787792 VPBB1->appendRecipe (I1);
788793 VPBB1->setName (" bb1" );
789794
@@ -1238,7 +1243,7 @@ TEST_F(VPRecipeTest, MayHaveSideEffectsAndMayReadWriteMemory) {
12381243TEST_F (VPRecipeTest, dumpRecipeInPlan) {
12391244 VPlan &Plan = getPlan ();
12401245 VPBasicBlock *VPBB0 = Plan.getEntry ();
1241- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
1246+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
12421247 VPBlockUtils::connectBlocks (VPBB1, Plan.getScalarHeader ());
12431248 VPBlockUtils::connectBlocks (VPBB0, VPBB1);
12441249
@@ -1307,7 +1312,7 @@ TEST_F(VPRecipeTest, dumpRecipeInPlan) {
13071312TEST_F (VPRecipeTest, dumpRecipeUnnamedVPValuesInPlan) {
13081313 VPlan &Plan = getPlan ();
13091314 VPBasicBlock *VPBB0 = Plan.getEntry ();
1310- VPBasicBlock *VPBB1 = new VPBasicBlock ( );
1315+ VPBasicBlock *VPBB1 = Plan. createVPBasicBlock ( " " );
13111316 VPBlockUtils::connectBlocks (VPBB1, Plan.getScalarHeader ());
13121317 VPBlockUtils::connectBlocks (VPBB0, VPBB1);
13131318
0 commit comments