convert named to anonymous structs when creating target ext types

Author: bob80905

clang/test/AST/HLSL/StructuredBuffer-AST-2.hlsl

@@ -1,13 +1,14 @@
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.6-compute -S -finclude-default-header -o - %s | FileCheck %s
 
-// The purpose of this test is to ensure that the AST writer
-// only emits struct bodies when within the context of a 
-// larger object that is being outputted on the RHS.
-
+// The purpose of this test is to ensure that the target
+// extension type associated with the structured buffer only
+// contains anonymous struct types, rather than named
+// struct types
 
 // note that "{ <4 x float> }" in the check below is a struct type, but only the
 // body is emitted on the RHS because we are already in the context of a
 // target extension type definition (class.hlsl::StructuredBuffer)
+
 // CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer", { <4 x float> }, 0, 0), %struct.mystruct }
 // CHECK: %struct.mystruct = type { <4 x float> }
 // CHECK: %dx.types.Handle = type { ptr }

llvm/lib/IR/Type.cpp

@@ -794,8 +794,17 @@ TargetExtType::TargetExtType(LLVMContext &C, StringRef Name,
   // Parameter storage immediately follows the class in allocation.
   Type **Params = reinterpret_cast<Type **>(this + 1);
   ContainedTys = Params;
-  for (Type *T : Types)
-    *Params++ = T;
+  for (Type *T : Types) {
+    // target ext type parameters may not be named struct types
+    // so we should convert any named struct types to anonymous
+    // struct types in the parameter list
+    Type *ConvertedTy = T;
+    if (auto *STy = dyn_cast<StructType>(T)) {
+      if (STy->hasName())
+        ConvertedTy = StructType::get(C, STy->elements(), /*isPacked=*/false);
+    }
+    *Params++ = ConvertedTy;
+  }
 
   setSubclassData(Ints.size());
   unsigned *IntParamSpace = reinterpret_cast<unsigned *>(Params);