diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorizationLegality.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorizationLegality.cpp
--- a/llvm/lib/Transforms/Vectorize/LoopVectorizationLegality.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorizationLegality.cpp
@@ -128,13 +128,13 @@
       // property, then assume it concerns only a fixed-width UserVF.
       // If width is not set, the flag takes precedence.
       Scalable.Value = SK_FixedWidthOnly;
-  }
 
-  // If the flag is set to force any use of scalable vectors, override the loop
-  // hints.
-  if (ForceScalableVectorization.getValue() !=
-      LoopVectorizeHints::SK_Unspecified)
-    Scalable.Value = ForceScalableVectorization.getValue();
+    // If the flag is set to force any use of scalable vectors, override the
+    // loop hints.
+    if (ForceScalableVectorization.getValue() !=
+        LoopVectorizeHints::SK_Unspecified)
+      Scalable.Value = ForceScalableVectorization.getValue();
+  }
 
   // Scalable vectorization is disabled if no preference is specified.
   if ((LoopVectorizeHints::ScalableForceKind)Scalable.Value == SK_Unspecified)