aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp2
-rw-r--r--test/NaCl/PNaClABI/instructions.ll4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp b/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp
index f96b45752b..cd3ede4b58 100644
--- a/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp
+++ b/lib/Analysis/NaCl/PNaClABIVerifyFunctions.cpp
@@ -72,6 +72,7 @@ bool PNaClABIVerifyFunctions::runOnFunction(Function &F) {
// Zero-cost C++ exception handling is not supported yet.
case Instruction::Invoke:
case Instruction::LandingPad:
+ case Instruction::Resume:
// indirectbr may interfere with streaming
case Instruction::IndirectBr:
// No vector instructions yet
@@ -87,7 +88,6 @@ bool PNaClABIVerifyFunctions::runOnFunction(Function &F) {
case Instruction::Ret:
case Instruction::Br:
case Instruction::Switch:
- case Instruction::Resume:
case Instruction::Unreachable:
// Binary operations
case Instruction::Add:
diff --git a/test/NaCl/PNaClABI/instructions.ll b/test/NaCl/PNaClABI/instructions.ll
index 2a1f7de386..765bae6d6f 100644
--- a/test/NaCl/PNaClABI/instructions.ll
+++ b/test/NaCl/PNaClABI/instructions.ll
@@ -14,7 +14,6 @@ next:
switch i32 1, label %next2 [i32 0, label %next]
next2:
unreachable
- resume i8 0
; CHECK-NOT: disallowed
; CHECK: Function terminators has disallowed instruction: indirectbr
indirectbr i8* undef, [label %next, label %next2]
@@ -124,7 +123,8 @@ onerror:
catch i32* null
; CHECK-NEXT: Function invoke_func has disallowed instruction: landingpad
; CHECK-NEXT: Function invoke_func contains disallowed ConstantExpr
- ret void
+ resume i32 %lp
+; CHECK-NEXT: Function invoke_func has disallowed instruction: resume
}
define i32 @va_arg(i8* %va_list) {