Skip to content

Commit 4d0b8cd

Browse files
author
Jan Voung
committed
Move llvm.eh.frame.cfa to the blacklist of intrinsics.
Tests that use them now skip ABI verification. Known tests that use this are the scons tests: - the barebones_stack_alignment16 test and - the EH ones under tests/toolchain/ Also list other eh_* in the blacklist more explicitly (they were already caught by the default case). BUG=https://code.google.com/p/nativeclient/issues/detail?id=3378 TEST= scons, gcc torture, llvm [email protected] Review URL: https://codereview.chromium.org/14998008
1 parent 4fbe1a0 commit 4d0b8cd

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

lib/Analysis/NaCl/PNaClABIVerifyModule.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,16 @@ bool PNaClABIVerifyModule::IsWhitelistedIntrinsic(const Function* F,
148148
// (2) Known to be never allowed.
149149
case Intrinsic::not_intrinsic:
150150
case Intrinsic::adjust_trampoline:
151+
case Intrinsic::eh_dwarf_cfa:
152+
case Intrinsic::eh_return_i32:
153+
case Intrinsic::eh_return_i64:
154+
case Intrinsic::eh_sjlj_callsite:
155+
case Intrinsic::eh_sjlj_functioncontext:
156+
case Intrinsic::eh_sjlj_longjmp:
157+
case Intrinsic::eh_sjlj_lsda:
158+
case Intrinsic::eh_sjlj_setjmp:
159+
case Intrinsic::eh_typeid_for:
160+
case Intrinsic::eh_unwind_init:
151161
case Intrinsic::init_trampoline:
152162
case Intrinsic::stackprotector:
153163
case Intrinsic::vacopy:
@@ -164,7 +174,6 @@ bool PNaClABIVerifyModule::IsWhitelistedIntrinsic(const Function* F,
164174
case Intrinsic::ctlz: // Support via compiler_rt if arch doesn't have it?
165175
case Intrinsic::ctpop: // Support via compiler_rt if arch doesn't have it?
166176
case Intrinsic::cttz: // Support via compiler_rt if arch doesn't have it?
167-
case Intrinsic::eh_dwarf_cfa: // For EH tests.
168177
case Intrinsic::exp: // Rounding not defined: support with fast-math?
169178
case Intrinsic::exp2: // Rounding not defined: support with fast-math?
170179
case Intrinsic::expect: // From __builtin_expect.

0 commit comments

Comments
 (0)