summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/ReleaseNotes.html7
-rw-r--r--include/llvm-c/Core.h4
-rw-r--r--lib/VMCore/Core.cpp4
3 files changed, 7 insertions, 8 deletions
diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index 0b0377d875..025f91a8f8 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -596,7 +596,7 @@ from the previous release.</p>
<div>
<p>In addition, many APIs have changed in this release. Some of the major
- LLVM API changes are:</p>
+ LLVM API changes are:</p>
<ul>
<li>The biggest and most pervasive change is that llvm::Type's are no longer
@@ -662,6 +662,11 @@ from the previous release.</p>
<li>All forms of <code>StringMap::getOrCreateValue</code> have been remove
except for the one which takes a <code>StringRef</code>.</li>
+<li>The <code>LLVMBuildUnwind</code> function from the C API was removed. The
+ LLVM <code>unwind</code> instruction has been deprecated for a long time and
+ isn't used by the current front-ends. So this was removed along with the
+ exception handling rewrite.</li>
+
</ul>
</div>
diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h
index 782b7eae9a..0acf5a23af 100644
--- a/include/llvm-c/Core.h
+++ b/include/llvm-c/Core.h
@@ -125,7 +125,7 @@ typedef enum {
LLVMSwitch = 3,
LLVMIndirectBr = 4,
LLVMInvoke = 5,
- LLVMUnwind = 6,
+ /* removed 6 due to API changes */
LLVMUnreachable = 7,
/* Standard Binary Operators */
@@ -479,7 +479,6 @@ LLVMTypeRef LLVMX86MMXType(void);
macro(ReturnInst) \
macro(SwitchInst) \
macro(UnreachableInst) \
- macro(UnwindInst) \
macro(ResumeInst) \
macro(UnaryInstruction) \
macro(AllocaInst) \
@@ -828,7 +827,6 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilderRef, LLVMValueRef Fn,
LLVMValueRef *Args, unsigned NumArgs,
LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
const char *Name);
-LLVMValueRef LLVMBuildUnwind(LLVMBuilderRef);
LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp
index ce010c1b7d..bff0d865cf 100644
--- a/lib/VMCore/Core.cpp
+++ b/lib/VMCore/Core.cpp
@@ -1683,10 +1683,6 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilderRef B, LLVMValueRef Fn,
Name));
}
-LLVMValueRef LLVMBuildUnwind(LLVMBuilderRef B) {
- return wrap(unwrap(B)->CreateUnwind());
-}
-
LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn) {
return wrap(unwrap(B)->CreateResume(unwrap(Exn)));
}