commit 36b49e8834f29cff9ccc556d165ced4c5054842b
author Sarah <sarahmashay@google.com> Wed Jul 21 03:34:34 2021 +0000
committer Sarah Mashayekhi <sarahmashay@google.com> Wed Jul 21 03:34:34 2021 +0000
tree 7535b9b00973b2df3c233f3b689ea9c01b293fa9
parent 0c7332b2baf559835d31174ae7dfc452b35d3568

validation: fix error msg: textureSample*() offset must be a const_expr

Bug: tint:1016
Change-Id: I631ac820f3174ec7ad12e51396b7584df55b27f1
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/59001
Auto-Submit: Sarah Mashayekhi <sarahmashay@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/resolver/intrinsic_validation_test.cc

diff --git a/src/resolver/intrinsic_validation_test.cc b/src/resolver/intrinsic_validation_test.cc
index fef6915..6313ccc 100644
--- a/src/resolver/intrinsic_validation_test.cc
+++ b/src/resolver/intrinsic_validation_test.cc
@@ -223,8 +223,7 @@
   EXPECT_FALSE(r()->Resolve());
   std::stringstream err;
   err << "12:34 error: '" << param.function
-      << "' offset parameter must be provided as"
-      << " a literal or const_expr expression";
+      << "' offset parameter must be a const_expression";
   EXPECT_EQ(r()->error(), err.str());
 }
 
@@ -253,8 +252,7 @@
   EXPECT_FALSE(r()->Resolve());
   std::stringstream err;
   err << "12:34 error: '" << param.function
-      << "' offset parameter must be provided as"
-      << " a literal or const_expr expression";
+      << "' offset parameter must be a const_expression";
   EXPECT_EQ(r()->error(), err.str());
 }
 

src/resolver/resolver.cc

diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 35812c4..844d444 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -2479,10 +2479,9 @@
     if (param->Is<ast::TypeConstructorExpression>()) {
       auto values = ConstantValueOf(param);
       if (!values.IsValid()) {
-        AddError("'" + func_name +
-                     "' offset parameter must be provided as a literal or "
-                     "const_expr expression",
-                 param->source());
+        AddError(
+            "'" + func_name + "' offset parameter must be a const_expression",
+            param->source());
         return false;
       }
       if (!values.Type()->Is<sem::Vector>() ||
@@ -2503,10 +2502,9 @@
         }
       }
     } else {
-      AddError("'" + func_name +
-                   "' offset parameter must be provided as a literal or "
-                   "const_expr expression",
-               param->source());
+      AddError(
+          "'" + func_name + "' offset parameter must be a const_expression",
+          param->source());
       return false;
     }
   }