@@ -310,9 +310,8 @@ Value *VPTransformState::get(VPValue *Def, bool NeedsScalar) {
310310 if (!hasScalarValue (Def, LastLane)) {
311311 // At the moment, VPWidenIntOrFpInductionRecipes, VPScalarIVStepsRecipes and
312312 // VPExpandSCEVRecipes can also be uniform.
313- assert ((isa<VPWidenIntOrFpInductionRecipe>(Def->getDefiningRecipe ()) ||
314- isa<VPScalarIVStepsRecipe>(Def->getDefiningRecipe ()) ||
315- isa<VPExpandSCEVRecipe>(Def->getDefiningRecipe ())) &&
313+ assert ((isa<VPWidenIntOrFpInductionRecipe, VPScalarIVStepsRecipe,
314+ VPExpandSCEVRecipe>(Def->getDefiningRecipe ())) &&
316315 " unexpected recipe found to be invariant" );
317316 IsUniform = true ;
318317 LastLane = 0 ;
@@ -361,7 +360,7 @@ void VPTransformState::addNewMetadata(Instruction *To,
361360 const Instruction *Orig) {
362361 // If the loop was versioned with memchecks, add the corresponding no-alias
363362 // metadata.
364- if (LVer && ( isa<LoadInst>(Orig) || isa< StoreInst>(Orig) ))
363+ if (LVer && isa<LoadInst, StoreInst>(Orig))
365364 LVer->annotateInstWithNoAlias (To, Orig);
366365}
367366
@@ -1028,8 +1027,7 @@ void VPlan::execute(VPTransformState *State) {
10281027 if (isa<VPWidenPHIRecipe>(&R))
10291028 continue ;
10301029
1031- if (isa<VPWidenPointerInductionRecipe>(&R) ||
1032- isa<VPWidenIntOrFpInductionRecipe>(&R)) {
1030+ if (isa<VPWidenPointerInductionRecipe, VPWidenIntOrFpInductionRecipe>(&R)) {
10331031 PHINode *Phi = nullptr ;
10341032 if (isa<VPWidenIntOrFpInductionRecipe>(&R)) {
10351033 Phi = cast<PHINode>(State->get (R.getVPSingleValue ()));
0 commit comments