Add new argument to createStaticMemberType

Makes llpc compatible with the change in llvm/llvm-project#72234
Flakebi · Nov 15, 2023 · dc68085 · dc68085
1 parent 59f30aa
commit dc68085
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/imported/llvm-dialects b/imported/llvm-dialects
diff --git a/llpc/translator/lib/SPIRV/SPIRVToLLVMDbgTran.cpp b/llpc/translator/lib/SPIRV/SPIRVToLLVMDbgTran.cpp
@@ -371,7 +371,15 @@ DINode *SPIRVToLLVMDbgTran::transTypeMember(const SPIRVExtInst *DebugInst) {
     SPIRVValue *ConstVal = BM->get<SPIRVValue>(Ops[ValueIdx]);
     assert(isConstantOpCode(ConstVal->getOpCode()) && "Static member must be a constant");
     llvm::Value *Val = SPIRVReader->transValue(ConstVal, nullptr, nullptr);
-    return Builder.createStaticMemberType(Scope, Name, File, LineNo, BaseType, Flags, cast<llvm::Constant>(Val));
+    return Builder.createStaticMemberType(
+        Scope, Name, File, LineNo, BaseType, Flags,
+        cast<llvm::Constant>(Val)
+#if !defined(LLVM_MAIN_REVISION) || LLVM_MAIN_REVISION >= 480812
+        // New version of the code (also handles unknown version, which we treat as latest)
+        ,
+        llvm::dwarf::DW_TAG_member
+#endif
+    );
   }
   uint64_t Size = getConstant(Ops[SizeIdx]);
   uint64_t Alignment = 0;
+2 −2		.github/workflows/check-dialects-docker.yml
+4 −0		docker/dialects.Dockerfile
+26 −0		example/ExampleDialect.td
+32 −0		example/ExampleMain.cpp
+8 −5		include/llvm-dialects/Dialect/Dialect.h
+28 −3		include/llvm-dialects/Dialect/OpDescription.h
+766 −0		include/llvm-dialects/Dialect/OpMap.h
+218 −0		include/llvm-dialects/Dialect/OpSet.h
+47 −9		include/llvm-dialects/Dialect/Visitor.h
+38 −25		lib/Dialect/Dialect.cpp
+7 −0		lib/Dialect/OpDescription.cpp
+41 −80		lib/Dialect/Visitor.cpp
+1 −0		lib/TableGen/Operations.cpp
+2 −0		test/CMakeLists.txt
+161 −0		test/example/generated/ExampleDialect.cpp.inc
+43 −0		test/example/generated/ExampleDialect.h.inc
+8 −6		test/example/test-builder.test
+12 −0		test/example/visitor-basic.ll
+39 −0		test/unit/CMakeLists.txt
+12 −0		test/unit/dialect/CMakeLists.txt
+32 −0		test/unit/dialect/TestDialect.cpp
+32 −0		test/unit/dialect/TestDialect.h
+67 −0		test/unit/dialect/TestDialect.td
+6 −0		test/unit/interface/CMakeLists.txt
+254 −0		test/unit/interface/OpMapIRTests.cpp
+258 −0		test/unit/interface/OpMapTests.cpp
+114 −0		test/unit/interface/OpSetTests.cpp
+60 −0		test/unit/lit.cfg.py
+22 −0		test/unit/lit.site.cfg.py.in