WIP: FIXUP: use lowered exprs for span lookup in select lowering diag.

TODO: …but it doesn't work!

Author: ErichDonGubler

naga/src/front/wgsl/lower/mod.rs

@@ -2484,11 +2484,9 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
                         "select" => {
                             let mut args = ctx.prepare_args(arguments, 3, span);
 
-                            let reject_orig = args.next()?;
-                            let accept_orig = args.next()?;
                             let mut values = [
-                                self.expression_for_abstract(reject_orig, ctx)?,
-                                self.expression_for_abstract(accept_orig, ctx)?,
+                                self.expression_for_abstract(args.next()?, ctx)?,
+                                self.expression_for_abstract(args.next()?, ctx)?,
                             ];
                             let condition = self.expression(args.next()?, ctx)?;
 
@@ -2500,18 +2498,15 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
                             ) -> &'a proc::TypeResolution {
                                 &ctx.typifier()[expr]
                             }
-                            let diag_deets =
-                                |ctx: &ExpressionContext<'_, '_, '_>,
-                                 ty_res: &proc::TypeResolution,
-                                 orig_expr| {
-                                    (
-                                        ctx.ast_expressions.get_span(orig_expr),
-                                        format!("`{}`", ctx.as_diagnostic_display(ty_res)),
-                                    )
-                                };
-                            for (&value, orig_value) in
-                                values.iter().zip([reject_orig, accept_orig])
-                            {
+                            let diag_deets = |ctx: &ExpressionContext<'_, '_, '_>,
+                                              ty_res: &proc::TypeResolution,
+                                              expr| {
+                                (
+                                    ctx.get_expression_span(expr),
+                                    format!("`{}`", ctx.as_diagnostic_display(ty_res)),
+                                )
+                            };
+                            for value in values {
                                 ctx.grow_types(value)?;
 
                                 let value_ty_res = expr_ty_res(ctx, value);
@@ -2520,8 +2515,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
                                     .vector_size_and_scalar()
                                     .is_none()
                                 {
-                                    let (arg_span, arg_type) =
-                                        diag_deets(ctx, value_ty_res, orig_value);
+                                    let (arg_span, arg_type) = diag_deets(ctx, value_ty_res, value);
                                     return Err(Box::new(Error::SelectUnexpectedArgumentType {
                                         arg_span,
                                         arg_type,
@@ -2533,12 +2527,10 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
                                 .map_err(|_idx| {
                                     let [reject, accept] = values;
                                     let [(reject_span, reject_type), (accept_span, accept_type)] =
-                                        [(reject_orig, reject), (accept_orig, accept)].map(
-                                            |(orig_expr, expr)| {
-                                                let ty_res = expr_ty_res(ctx, expr);
-                                                diag_deets(ctx, ty_res, orig_expr)
-                                            },
-                                        );
+                                        [reject, accept].map(|expr| {
+                                            let ty_res = expr_ty_res(ctx, expr);
+                                            diag_deets(ctx, ty_res, expr)
+                                        });
                                     Error::SelectRejectAndAcceptHaveNoCommonType {
                                         reject_span,
                                         reject_type,

naga/tests/naga/wgsl_errors.rs

@@ -2055,12 +2055,7 @@ fn select() {
         ",
             "\
 error: unexpected argument type for `select` call
-  ┌─ wgsl:5:28
-  │
-5 │             let p = select(&x, &y, which);
-  │                            ^^ this value of type `ptr<function, i32>`
-  │
-  = note: expected a scalar or a `vecN` of scalars
+ = note: expected a scalar or a `vecN` of scalars
 
 ",
         ),
@@ -2075,12 +2070,7 @@ error: unexpected argument type for `select` call
         ",
             "\
 error: unexpected argument type for `select` call
-  ┌─ wgsl:5:28
-  │
-5 │             let s = select(x, y, which);
-  │                            ^ this value of type `array<i32, 4>`
-  │
-  = note: expected a scalar or a `vecN` of scalars
+ = note: expected a scalar or a `vecN` of scalars
 
 ",
         ),
@@ -2096,14 +2086,9 @@ error: unexpected argument type for `select` call
         ",
             "\
 error: unexpected argument type for `select` call
-  ┌─ wgsl:6:28
-  │
-6 │             let s = select(x, y, which);
-  │                            ^ this value of type `S`
-  │
-  = note: expected a scalar or a `vecN` of scalars
+ = note: expected a scalar or a `vecN` of scalars
 
-"
+",
         ),
         (
             "