diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst --- a/llvm/docs/ReleaseNotes.rst +++ b/llvm/docs/ReleaseNotes.rst @@ -199,6 +199,9 @@ * ``LLVMConstURem`` * ``LLVMConstSRem`` +* Add ``LLVMDeleteInstruction`` function which allows deleting instructions that + are not inserted into a basic block. + Changes to the Go bindings -------------------------- diff --git a/llvm/include/llvm-c/Core.h b/llvm/include/llvm-c/Core.h --- a/llvm/include/llvm-c/Core.h +++ b/llvm/include/llvm-c/Core.h @@ -3228,7 +3228,7 @@ LLVMValueRef LLVMGetPreviousInstruction(LLVMValueRef Inst); /** - * Remove and delete an instruction. + * Remove an instruction. * * The instruction specified is removed from its containing building * block but is kept alive. @@ -3247,6 +3247,16 @@ */ void LLVMInstructionEraseFromParent(LLVMValueRef Inst); +/** + * Delete an instruction. + * + * The instruction specified is deleted. It must have previously been + * removed from its containing building block. + * + * @see llvm::Value::deleteValue() + */ +void LLVMDeleteInstruction(LLVMValueRef Inst); + /** * Obtain the code opcode for an individual instruction. * diff --git a/llvm/lib/IR/Core.cpp b/llvm/lib/IR/Core.cpp --- a/llvm/lib/IR/Core.cpp +++ b/llvm/lib/IR/Core.cpp @@ -2803,6 +2803,10 @@ unwrap(Inst)->eraseFromParent(); } +void LLVMDeleteInstruction(LLVMValueRef Inst) { + unwrap(Inst)->deleteValue(); +} + LLVMIntPredicate LLVMGetICmpPredicate(LLVMValueRef Inst) { if (ICmpInst *I = dyn_cast(unwrap(Inst))) return (LLVMIntPredicate)I->getPredicate(); diff --git a/llvm/tools/llvm-c-test/metadata.c b/llvm/tools/llvm-c-test/metadata.c --- a/llvm/tools/llvm-c-test/metadata.c +++ b/llvm/tools/llvm-c-test/metadata.c @@ -31,12 +31,11 @@ LLVMValueRef values[] = { LLVMConstInt(LLVMInt32Type(), 0, 0) }; // This used to trigger an assertion - LLVMSetMetadata( - LLVMBuildRetVoid(b), - LLVMGetMDKindID("kind", 4), - LLVMMDNode(values, 1)); + LLVMValueRef ret = LLVMBuildRetVoid(b); + LLVMSetMetadata(ret, LLVMGetMDKindID("kind", 4), LLVMMDNode(values, 1)); LLVMDisposeBuilder(b); + LLVMDeleteInstruction(ret); return 0; }