Backport fix for global variables with array initializers.

ronlieb · ronlieb · commit b65ba2471b32 · 2025-02-25T20:37:56.000-05:00
Change-Id: I5b68b5a2db54af456cdb192ebf634198e40345d8
diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
@@ -2081,7 +2081,8 @@ LLVMToSPIRVBase::transValueWithoutDecoration(Value *V, SPIRVBasicBlock *BB,
           }
         }
       }
-      if (BM->isAllowedToUseExtension(ExtensionID::SPV_KHR_untyped_pointers)) {
+      if (BM->isAllowedToUseExtension(ExtensionID::SPV_KHR_untyped_pointers) &&
+          !Init->getType()->isArrayTy()) {
         BVarInit = transConstantUse(Init, transType(Init->getType()));
       } else {
         SPIRVType *TransTy = transType(Ty);

Original file line number	Diff line number	Diff line change
`@@ -2081,7 +2081,8 @@ LLVMToSPIRVBase::transValueWithoutDecoration(Value V, SPIRVBasicBlock BB,`
`2081`	`2081`	`}`
`2082`	`2082`	`}`
`2083`	`2083`	`}`
`2084`		`- if (BM->isAllowedToUseExtension(ExtensionID::SPV_KHR_untyped_pointers)) {`
	`2084`	`+ if (BM->isAllowedToUseExtension(ExtensionID::SPV_KHR_untyped_pointers) &&`
	`2085`	`+ !Init->getType()->isArrayTy()) {`
`2085`	`2086`	`BVarInit = transConstantUse(Init, transType(Init->getType()));`
`2086`	`2087`	`} else {`
`2087`	`2088`	`SPIRVType *TransTy = transType(Ty);`