Commit 4fbc100959c05ba10e4bfeeca9c7b5cd8216cc57 | zig

author	Robin Voetter <robin@voetter.nl> 2024-11-02 12:34:02+01:00
committer	Robin Voetter <robin@voetter.nl> 2024-11-08 20:38:21+01:00
log	4fbc100959c05ba10e4bfeeca9c7b5cd8216cc57
tree	2b81a6931b173370124f709978beada77cf03f30
parent	08ad7afc1e90c68409e9dc869d9dc1dceb3e8564
signature	Signed by SSH key SHA256:ZS52FNyUv2WUXvO4njmVaFVO46RHojFuOrxRc4LuKzg

For now the frontend still allows type inputs in assembly. We
might as well resolve them properly in the SPIR-V backend.

1 files changed, 11 insertions(+), 3 deletions(-)

src/codegen/spirv.zig+11-3

 @@ -1662,7 +1662,7 @@ const NavGen = struct {
                         else => unreachable,
                     }
-                    // Guaranteed by callConvSupportsVarArgs, there are nog SPIR-V CCs which support
+                    // Guaranteed by callConvSupportsVarArgs, there are no SPIR-V CCs which support
                     // varargs.
                     assert(!fn_info.is_var_args);
 @@ -6580,8 +6580,16 @@ const NavGen = struct {
             // for the string, we still use the next u32 for the null terminator.
             input_extra_i += (constraint.len + name.len + (2 + 3)) / 4;
-            const value = try self.resolve(input);
+            if (self.typeOf(input).zigTypeTag(zcu) == .type) {
-            try as.value_map.put(as.gpa, name, .{ .value = value });
+                // This assembly input is a type instead of a value.
+                // That's fine for now, just make sure to resolve it as such.
+                const val = (try self.air.value(input, self.pt)).?;
+                const ty_id = try self.resolveType(val.toType(), .direct);
+                try as.value_map.put(as.gpa, name, .{ .ty = ty_id });
+            } else {
+                const val_id = try self.resolve(input);
+                try as.value_map.put(as.gpa, name, .{ .value = val_id });
+            }
         }
         as.assemble() catch |err| switch (err) {