From 427dd9003a41f7b6a927ac6b928f5b1ff6465bf6 Mon Sep 17 00:00:00 2001
From: Alexey Bataev <a.bataev@outlook.com>
Date: Fri, 3 May 2024 11:27:57 +0000
Subject: [PATCH] Address comments

Created using spr 1.3.5
---
 llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index 6d6f01a2196ed1..72819970f8d089 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -9402,8 +9402,8 @@ void VPWidenLoadEVLRecipe::execute(VPTransformState &State) {
   Value *EVL = State.get(getEVL(), VPIteration(0, 0));
   Value *Addr = State.get(getAddr(), 0, !CreateGather);
   Value *Mask = nullptr;
-  if (getMask()) {
-    Mask = State.get(getMask(), 0);
+  if (VPValue *VPMask = getMask()) {
+    Mask = State.get(VPMask, 0);
     if (isReverse())
       Mask = createReverseEVL(Builder, Mask, EVL, "vp.reverse.mask");
   } else {
@@ -9424,10 +9424,11 @@ void VPWidenLoadEVLRecipe::execute(VPTransformState &State) {
       0, Attribute::getWithAlignment(NewLI->getContext(), Alignment));
   State.addMetadata(NewLI, LI);
   Instruction *Res = NewLI;
-  if (isReverse())
+  if (isReverse()) {
     // Use cheap all-true mask for reverse rather than actual mask, it does not
     // affect the result.
     Res = createReverseEVL(Builder, Res, EVL, "vp.reverse");
+  }
   State.set(this, Res, 0);
 }
 
@@ -9486,13 +9487,14 @@ void VPWidenStoreEVLRecipe::execute(VPTransformState &State) {
   CallInst *NewSI = nullptr;
   Value *StoredVal = State.get(StoredValue, 0);
   Value *EVL = State.get(getEVL(), VPIteration(0, 0));
-  if (isReverse())
+  if (isReverse()) {
     // Use cheap all-true mask for reverse rather than actual mask, it does not
     // affect the result.
     StoredVal = createReverseEVL(Builder, StoredVal, EVL, "vp.reverse");
+  }
   Value *Mask = nullptr;
-  if (getMask()) {
-    Mask = State.get(getMask(), 0);
+  if (VPValue *VPMask = getMask()) {
+    Mask = State.get(VPMask, 0);
     if (isReverse())
       Mask = createReverseEVL(Builder, Mask, EVL, "vp.reverse.mask");
   } else {