From 0165015f6cd0b8dc4d5127a7c7a13b6e4ac89f91 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 27 Sep 2015 17:16:46 +0000 Subject: builtins: silence GCC warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the builtins are built with libgcc as the unwind provider on ARM, the exposed _Unwind_SetIP is a macro. This results in the following warning due to expansion of the argument: warning: suggest parentheses around arithmetic in operand of ‘|’ [-Wparentheses] Add a no-op set of parenthesis around the argument that will prevent this warning. llvm-svn: 248686 --- compiler-rt/lib/builtins/gcc_personality_v0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler-rt/lib/builtins/gcc_personality_v0.c') diff --git a/compiler-rt/lib/builtins/gcc_personality_v0.c b/compiler-rt/lib/builtins/gcc_personality_v0.c index 4b95cfd43b0..331dc2bea2e 100644 --- a/compiler-rt/lib/builtins/gcc_personality_v0.c +++ b/compiler-rt/lib/builtins/gcc_personality_v0.c @@ -194,15 +194,15 @@ __gcc_personality_v0(int version, _Unwind_Action actions, * Set Instruction Pointer to so we re-enter function * at landing pad. The landing pad is created by the compiler * to take two parameters in registers. - */ - _Unwind_SetGR(context, __builtin_eh_return_data_regno(0), - (uintptr_t)exceptionObject); + */ + _Unwind_SetGR(context, __builtin_eh_return_data_regno(0), + (uintptr_t)exceptionObject); _Unwind_SetGR(context, __builtin_eh_return_data_regno(1), 0); - _Unwind_SetIP(context, funcStart+landingPad); + _Unwind_SetIP(context, (funcStart + landingPad)); return _URC_INSTALL_CONTEXT; } } - + /* No landing pad found, continue unwinding. */ return _URC_CONTINUE_UNWIND; } -- cgit v1.2.3