change asmwriter

Author: bob80905

clang/lib/CodeGen/Targets/DirectX.cpp

@@ -45,16 +45,6 @@ llvm::Type *DirectXTargetCodeGenInfo::getHLSLType(CodeGenModule &CGM,
 
     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 ==
@@ -63,7 +53,7 @@ llvm::Type *DirectXTargetCodeGenInfo::getHLSLType(CodeGenModule &CGM,
     if (!ResAttrs.RawBuffer)
       Ints.push_back(/*IsSigned*/ ContainedTy->isSignedIntegerType());
 
-    return llvm::TargetExtType::get(Ctx, TypeName, {ConvertedElemType}, Ints);
+    return llvm::TargetExtType::get(Ctx, TypeName, {ElemType}, Ints);
   }
   case llvm::dxil::ResourceClass::CBuffer:
     llvm_unreachable("dx.CBuffer handles are not implemented yet");

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

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.6-compute -S -finclude-default-header -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -S -finclude-default-header -o - %s | FileCheck %s
 
 // The purpose of this test is to ensure that the target
 // extension type associated with the structured buffer only
@@ -9,7 +9,7 @@
 // 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: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer", %struct.mystruct, 0, 0), %struct.mystruct }
 // CHECK: %struct.mystruct = type { <4 x float> }
 // CHECK: %dx.types.Handle = type { ptr }
 // CHECK: %dx.types.ResBind = type { i32, i32, i32, i8 }

llvm/lib/IR/AsmWriter.cpp

@@ -649,8 +649,10 @@ void TypePrinting::print(Type *Ty, raw_ostream &OS) {
     OS << "target(\"";
     printEscapedString(Ty->getTargetExtName(), OS);
     OS << "\"";
-    for (Type *Inner : TETy->type_params())
-      OS << ", " << *Inner;
+    for (Type *Inner : TETy->type_params()) {
+      OS << ", ";
+      Inner->print(OS, /*IsForDebug=*/false, /*NoDetails=*/true);
+    }
     for (unsigned IntParam : TETy->int_params())
       OS << ", " << IntParam;
     OS << ")";

llvm/lib/IR/Type.cpp

@@ -794,17 +794,8 @@ 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) {
-    // 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))
-      assert(!STy->hasName() &&
-             "named structs are not allowed in target extension types");
-
-    *Params++ = ConvertedTy;
-  }
+  for (Type *T : Types)
+    *Params++ = T;
 
   setSubclassData(Ints.size());
   unsigned *IntParamSpace = reinterpret_cast<unsigned *>(Params);