Merge pull request #2532 from KhronosGroup/fix-2530

HansKristian-Work · web-flow · commit 2ea5d3731dc6 · 2025-08-15T17:16:38.000+02:00
MSL: Fix crash when using force-native-arrays in some cases.
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
@@ -16631,7 +16631,7 @@ string CompilerMSL::type_to_array_glsl(const SPIRType &type, uint32_t variable_i
 	default:
 		if (type_is_array_of_pointers(type) || using_builtin_array())
 		{
-			const SPIRVariable *var = variable_id ? &get<SPIRVariable>(variable_id) : nullptr;
+			const SPIRVariable *var = variable_id ? maybe_get<SPIRVariable>(variable_id) : nullptr;
 			if (var && (var->storage == StorageClassUniform || var->storage == StorageClassStorageBuffer) &&
 			    is_array(get_variable_data_type(*var)))
 			{

Original file line number	Diff line number	Diff line change
`@@ -16631,7 +16631,7 @@ string CompilerMSL::type_to_array_glsl(const SPIRType &type, uint32_t variable_i`
`16631`	`16631`	`default:`
`16632`	`16632`	`if (type_is_array_of_pointers(type) \|\| using_builtin_array())`
`16633`	`16633`	`{`
`16634`		`- const SPIRVariable *var = variable_id ? &get<SPIRVariable>(variable_id) : nullptr;`
	`16634`	`+ const SPIRVariable *var = variable_id ? maybe_get<SPIRVariable>(variable_id) : nullptr;`
`16635`	`16635`	`if (var && (var->storage == StorageClassUniform \|\| var->storage == StorageClassStorageBuffer) &&`
`16636`	`16636`	`is_array(get_variable_data_type(*var)))`
`16637`	`16637`	`{`