add assert, move conversion

Author: bob80905

clang/lib/CodeGen/Targets/DirectX.cpp

@@ -43,9 +43,18 @@ llvm::Type *DirectXTargetCodeGenInfo::getHLSLType(CodeGenModule &CGM,
     if (ContainedTy.isNull())
       return nullptr;
 
-    // convert element type
     llvm::Type *ElemType = CGM.getTypes().ConvertType(ContainedTy);
 
+    // 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
+    llvm::Type *ConvertedElemType = ElemType;
+    if (auto *STy = dyn_cast<llvm::StructType>(ElemType)) {
+      if (STy->hasName())
+        ConvertedElemType =
+            llvm::StructType::get(Ctx, STy->elements(), /*isPacked=*/false);
+    }
+
     llvm::StringRef TypeName =
         ResAttrs.RawBuffer ? "dx.RawBuffer" : "dx.TypedBuffer";
     SmallVector<unsigned, 3> Ints = {/*IsWriteable*/ ResAttrs.ResourceClass ==
@@ -54,7 +63,7 @@ llvm::Type *DirectXTargetCodeGenInfo::getHLSLType(CodeGenModule &CGM,
     if (!ResAttrs.RawBuffer)
       Ints.push_back(/*IsSigned*/ ContainedTy->isSignedIntegerType());
 
-    return llvm::TargetExtType::get(Ctx, TypeName, {ElemType}, Ints);
+    return llvm::TargetExtType::get(Ctx, TypeName, {ConvertedElemType}, Ints);
   }
   case llvm::dxil::ResourceClass::CBuffer:
     llvm_unreachable("dx.CBuffer handles are not implemented yet");

llvm/lib/IR/Type.cpp

@@ -799,10 +799,10 @@ TargetExtType::TargetExtType(LLVMContext &C, StringRef Name,
     // 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);
-    }
+    if (auto *STy = dyn_cast<StructType>(T))
+      assert(!STy->hasName() &&
+             "named structs are not allowed in target extension types");
+
     *Params++ = ConvertedTy;
   }