RustWrapper: Suppress getNextNonDebugInfoInstruction

heiher · heiher · commit d2d1c45cab46 · 2025-07-23T17:30:37.000+08:00
Link: llvm/llvm-project#144383
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -1610,7 +1610,11 @@ extern "C" void LLVMRustPositionBefore(LLVMBuilderRef B, LLVMValueRef Instr) {
 
 extern "C" void LLVMRustPositionAfter(LLVMBuilderRef B, LLVMValueRef Instr) {
   if (auto I = dyn_cast<Instruction>(unwrap<Value>(Instr))) {
+#if LLVM_VERSION_GE(22, 0)
+    auto J = I->getNextNode();
+#else
     auto J = I->getNextNonDebugInstruction();
+#endif
     unwrap(B)->SetInsertPoint(J);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1610,7 +1610,11 @@ extern "C" void LLVMRustPositionBefore(LLVMBuilderRef B, LLVMValueRef Instr) {`
`1610`	`1610`
`1611`	`1611`	`extern "C" void LLVMRustPositionAfter(LLVMBuilderRef B, LLVMValueRef Instr) {`
`1612`	`1612`	`if (auto I = dyn_cast<Instruction>(unwrap<Value>(Instr))) {`
	`1613`	`+#if LLVM_VERSION_GE(22, 0)`
	`1614`	`+ auto J = I->getNextNode();`
	`1615`	`+#else`
`1613`	`1616`	`auto J = I->getNextNonDebugInstruction();`
	`1617`	`+#endif`
`1614`	`1618`	`unwrap(B)->SetInsertPoint(J);`
`1615`	`1619`	`}`
`1616`	`1620`	`}`