DXIL: Use correct type ID when writing ValueAsMetadata.

Author: maleadt

llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp

@@ -1345,7 +1345,7 @@ void DXILBitcodeWriter::writeValueAsMetadata(
     Ty = TypedPointerType::get(F->getFunctionType(), F->getAddressSpace());
   else if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V))
     Ty = TypedPointerType::get(GV->getValueType(), GV->getAddressSpace());
-  Record.push_back(getTypeID(Ty));
+  Record.push_back(getTypeID(Ty, V));
   Record.push_back(VE.getValueID(V));
   Stream.EmitRecord(bitc::METADATA_VALUE, Record, 0);
   Record.clear();

llvm/test/tools/dxil-dis/metadata.ll

@@ -1,13 +1,21 @@
-; RUN: llc --filetype=obj %s -o - | dxil-dis 
+; RUN: llc --filetype=obj %s -o - | dxil-dis
 target triple = "dxil-unknown-shadermodel6.7-library"
 
+define void @kernel(ptr addrspace(1)) {
+    ret void
+}
+
 !llvm.foo = !{!0}
 !llvm.bar = !{!1}
+!llvm.baz = !{!2}
 
 !0 = !{i32 42}
 !1 = !{!"Some MDString"}
+!2 = !{ptr @kernel}
 
 ; CHECK: !llvm.foo = !{!0}
 ; CHECK: !llvm.bar = !{!1}
+; CHECK: !llvm.baz = !{!2}
 ; CHECK: !0 = !{i32 42}
 ; CHECK: !1 = !{!"Some MDString"}
+; CHECK: !2 = !{void (i8 addrspace(1)*)* @kernel}

llvm/tools/dxil-dis/CMakeLists.txt

@@ -25,7 +25,9 @@ include(ExternalProject)
 
 set(SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/DXC-src)
 set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/DXC-bins)
-set(GIT_SETTINGS GIT_REPOSITORY https://github.com/microsoft/DirectXShaderCompiler.git)
+set(GIT_SETTINGS
+    GIT_REPOSITORY https://github.com/microsoft/DirectXShaderCompiler.git
+    GIT_TAG main)
 
 if (DXC_SOURCE_DIR)
   set(SOURCE_DIR ${DXC_SOURCE_DIR})