From 1ac63d3a49753a4874549b94f71850b002c71432 Mon Sep 17 00:00:00 2001
From: Sylvester Hesp <github@oisyn.nl>
Date: Wed, 30 Nov 2022 15:29:49 +0100
Subject: [PATCH] Added passing of `FnAbi`

---
 crates/rustc_codegen_spirv/src/codegen_cx/entry.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/rustc_codegen_spirv/src/codegen_cx/entry.rs b/crates/rustc_codegen_spirv/src/codegen_cx/entry.rs
index cd8c9772ba..3e002f4287 100644
--- a/crates/rustc_codegen_spirv/src/codegen_cx/entry.rs
+++ b/crates/rustc_codegen_spirv/src/codegen_cx/entry.rs
@@ -98,7 +98,7 @@ impl<'tcx> CodegenCx<'tcx> {
         let fn_id = self.shader_entry_stub(
             span,
             entry_func,
-            &fn_abi.args,
+            fn_abi,
             hir_params,
             name,
             entry.execution_model,
@@ -116,7 +116,7 @@ impl<'tcx> CodegenCx<'tcx> {
         &self,
         span: Span,
         entry_func: SpirvValue,
-        arg_abis: &[ArgAbi<'tcx, Ty<'tcx>>],
+        entry_fn_abi: &FnAbi<'tcx, Ty<'tcx>>,
         hir_params: &[hir::Param<'tcx>],
         name: String,
         execution_model: ExecutionModel,
@@ -141,7 +141,7 @@ impl<'tcx> CodegenCx<'tcx> {
         let mut bx = Builder::build(self, Builder::append_block(self, stub_fn, ""));
         let mut call_args = vec![];
         let mut decoration_locations = FxHashMap::default();
-        for (entry_arg_abi, hir_param) in arg_abis.iter().zip(hir_params) {
+        for (entry_arg_abi, hir_param) in entry_fn_abi.args.iter().zip(hir_params) {
             bx.set_span(hir_param.span);
             self.declare_shader_interface_for_param(
                 execution_model,