[SPIR-V] Partial revert of d40eb0a (#74755)

sudonatalie · web-flow · commit 5ca1f2aff715 · 2023-12-07T15:22:54.000-05:00
This part of the #74660 patch was incorrect and shouldn't have been changed since this usage of `isOpaque()` is not one of `PointerType`'s functions.
diff --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
@@ -690,7 +690,9 @@ SPIRVType *SPIRVGlobalRegistry::createSPIRVType(
     return getOpTypeArray(Ty->getArrayNumElements(), El, MIRBuilder, EmitIR);
   }
   if (auto SType = dyn_cast<StructType>(Ty)) {
-    return getOpTypeOpaque(SType, MIRBuilder);
+    if (SType->isOpaque())
+      return getOpTypeOpaque(SType, MIRBuilder);
+    return getOpTypeStruct(SType, MIRBuilder, EmitIR);
   }
   if (auto FType = dyn_cast<FunctionType>(Ty)) {
     SPIRVType *RetTy = findSPIRVType(FType->getReturnType(), MIRBuilder);

Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,9 @@ SPIRVType *SPIRVGlobalRegistry::createSPIRVType(`
`690`	`690`	`return getOpTypeArray(Ty->getArrayNumElements(), El, MIRBuilder, EmitIR);`
`691`	`691`	`}`
`692`	`692`	`if (auto SType = dyn_cast<StructType>(Ty)) {`
`693`		`- return getOpTypeOpaque(SType, MIRBuilder);`
	`693`	`+ if (SType->isOpaque())`
	`694`	`+ return getOpTypeOpaque(SType, MIRBuilder);`
	`695`	`+ return getOpTypeStruct(SType, MIRBuilder, EmitIR);`
`694`	`696`	`}`
`695`	`697`	`if (auto FType = dyn_cast<FunctionType>(Ty)) {`
`696`	`698`	`SPIRVType *RetTy = findSPIRVType(FType->getReturnType(), MIRBuilder);`