fix(naga): Disallow const shifts of scalar by vector or vice-versa

Author: andyleiserson

cts_runner/test.lst

@@ -326,6 +326,7 @@ webgpu:shader,validation,expression,access,array:early_eval_errors:case="overrid
 webgpu:shader,validation,expression,access,structure:*
 webgpu:shader,validation,expression,binary,add_sub_mul:scalar_vector_out_of_range:lhs="i32";*
 webgpu:shader,validation,expression,binary,add_sub_mul:scalar_vector_out_of_range:lhs="u32";*
+webgpu:shader,validation,expression,binary,bitwise_shift:scalar_vector:*
 webgpu:shader,validation,expression,binary,parse:*
 webgpu:shader,validation,expression,binary,short_circuiting_and_or:array_override:op="%26%26";a_val=1;b_val=1
 webgpu:shader,validation,expression,binary,short_circuiting_and_or:invalid_types:*

naga/src/proc/constant_evaluator.rs

@@ -2753,26 +2753,36 @@ impl<'a> ConstantEvaluator<'a> {
                     ty,
                 },
                 &Expression::Literal(_),
-            ) => {
-                let mut components = src_components.clone();
-                for component in &mut components {
-                    *component = self.binary_op(op, *component, right, span)?;
+            ) => match op {
+                BinaryOperator::ShiftLeft | BinaryOperator::ShiftRight => {
+                    return Err(ConstantEvaluatorError::InvalidBinaryOpArgs);
                 }
-                Expression::Compose { ty, components }
-            }
+                _ => {
+                    let mut components = src_components.clone();
+                    for component in &mut components {
+                        *component = self.binary_op(op, *component, right, span)?;
+                    }
+                    Expression::Compose { ty, components }
+                }
+            },
             (
                 &Expression::Literal(_),
                 &Expression::Compose {
                     components: ref src_components,
                     ty,
                 },
-            ) => {
-                let mut components = src_components.clone();
-                for component in &mut components {
-                    *component = self.binary_op(op, left, *component, span)?;
+            ) => match op {
+                BinaryOperator::ShiftLeft | BinaryOperator::ShiftRight => {
+                    return Err(ConstantEvaluatorError::InvalidBinaryOpArgs);
                 }
-                Expression::Compose { ty, components }
-            }
+                _ => {
+                    let mut components = src_components.clone();
+                    for component in &mut components {
+                        *component = self.binary_op(op, left, *component, span)?;
+                    }
+                    Expression::Compose { ty, components }
+                }
+            },
             (
                 &Expression::Compose {
                     components: ref left_components,