diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/niter-convert-range.c b/gcc/testsuite/gcc.target/aarch64/sve2/niter-convert-range.c
new file mode 100644
index 00000000000..c96b2f3999c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/niter-convert-range.c
@@ -0,0 +1,68 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=armv8.3-a+sve2 -fdump-tree-vect-details" } */
+
+#include <stdint.h>
+
+int
+foo (char *buf, uint8_t len)
+{
+  int x = 0;
+
+  for (int16_t i = 0, y = 0; i < len; i++, y = i * 10)
+    x += (int) y * (buf[i] - '0');
+
+  return x;
+}
+
+int
+masked_len_foo (unsigned char *buf, uint16_t len)
+{
+  uint16_t n = len & 255;
+  int x = 0;
+
+  for (int16_t i = 0, y = 0; i < n; i++, y = i * 10)
+    x += (int) y * (buf[i] - '0');
+
+  return x;
+}
+
+int
+guarded_len_foo (char *buf, uint16_t len)
+{
+  if (len > 255)
+    return 0;
+
+  int x = 0;
+
+  for (int16_t i = 0, y = 0; i < len; i++, y = i * 10)
+    x += (int) y * (buf[i] - '0');
+
+  return x;
+}
+
+int
+non_value_preserving (unsigned char *buf, uint8_t len)
+{
+  int x = 0;
+
+  for (int16_t i = 0, y = 0; i < (int) (int8_t) len; i++, y = i * 10)
+    x += (int) y * (buf[i] - '0');
+
+  return x;
+}
+
+unsigned
+niter_convert_range_wrap (unsigned char *buf, uint8_t len)
+{
+  unsigned x = 0;
+
+  for (unsigned i = 0, y = 0; i < (unsigned) len - 1; i++, y = i * 10)
+    x += y * (buf[i] - '0');
+
+  return x;
+}
+
+/* { dg-final { scan-tree-dump-times {bounds on difference of bases: 0 [.][.][.] 126} 3 "vect" } } */
+/* { dg-final { scan-tree-dump-times {bounds on difference of bases: 0 [.][.][.] 254} 9 "vect" } } */
+/* { dg-final { scan-tree-dump-times {bounds on difference of bases: -1 [.][.][.] 4294967294} 3 "vect" } } */
+/* { dg-final { scan-tree-dump-times "loop vectorized using variable length vectors" 5 "vect" } } */
diff --git a/gcc/tree-ssa-loop-niter.cc b/gcc/tree-ssa-loop-niter.cc
index f179be1ffc7..b3a0aebfba2 100644
--- a/gcc/tree-ssa-loop-niter.cc
+++ b/gcc/tree-ssa-loop-niter.cc
@@ -356,15 +356,16 @@ determine_value_range (class loop *loop, tree type, tree var, mpz_t off,
   get_type_static_bounds (type, min, max);
 
   /* See if we have some range info from VRP.  */
-  if (TREE_CODE (var) == SSA_NAME && INTEGRAL_TYPE_P (type))
+  if (INTEGRAL_TYPE_P (type))
     {
       edge e = loop_preheader_edge (loop);
       signop sgn = TYPE_SIGN (type);
       gphi_iterator gsi;
+      gimple *ctx = last_nondebug_stmt (loop->header);
 
       /* Either for VAR itself...  */
       int_range_max var_range (TREE_TYPE (var));
-      get_range_query (cfun)->range_of_expr (var_range, var);
+      get_range_query (cfun)->range_of_expr (var_range, var, ctx);
       if (var_range.varying_p () || var_range.undefined_p ())
 	rtype = VR_VARYING;
       else
@@ -383,7 +384,8 @@ determine_value_range (class loop *loop, tree type, tree var, mpz_t off,
 	  gphi *phi = gsi.phi ();
 	  if (PHI_ARG_DEF_FROM_EDGE (phi, e) == var
 	      && get_range_query (cfun)->range_of_expr (phi_range,
-						    gimple_phi_result (phi))
+						    gimple_phi_result (phi),
+						    ctx)
 	      && !phi_range.varying_p ()
 	      && !phi_range.undefined_p ())
 	    {
@@ -404,7 +406,7 @@ determine_value_range (class loop *loop, tree type, tree var, mpz_t off,
 		  if (wi::gt_p (minv, maxv, sgn))
 		    {
 		      int_range_max vr (TREE_TYPE (var));
-		      get_range_query (cfun)->range_of_expr (vr, var);
+		      get_range_query (cfun)->range_of_expr (vr, var, ctx);
 		      if (vr.varying_p () || vr.undefined_p ())
 			rtype = VR_VARYING;
 		      else