diff options
| author | Sverker Eriksson <[email protected]> | 2015-04-08 16:10:41 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-04-08 16:10:41 +0200 |
| commit | 3698284c3746d913ada051f3370e567b8202b5d9 (patch) | |
| tree | 8bf39984b50994e43b2c45813dc1cb15ff4f08f5 /erts | |
| parent | b5c9107c86f73998a95d3f3e3429c68bf7216294 (diff) | |
| parent | da14897a6363a5c39180e8e3edf0c1c8336cfeb5 (diff) | |
| download | otp-3698284c3746d913ada051f3370e567b8202b5d9.tar.gz otp-3698284c3746d913ada051f3370e567b8202b5d9.tar.bz2 otp-3698284c3746d913ada051f3370e567b8202b5d9.zip | |
Merge branch 'sverk/valgrind-broken_halt'
* sverk/valgrind-broken_halt:
erts: Suppress valgrind for bif_SUITE:erlang_halt
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 20 | ||||
| -rw-r--r-- | erts/emulator/valgrind/suppress.patched.3.6.0 | 12 | ||||
| -rw-r--r-- | erts/emulator/valgrind/suppress.standard | 12 |
3 files changed, 39 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index b2658a1fd6..fa7de23f00 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -3747,6 +3747,20 @@ BIF_RETTYPE erts_internal_is_system_process_1(BIF_ALIST_1) static erts_smp_atomic_t hipe_test_reschedule_flag; +#if defined(VALGRIND) && defined(__GNUC__) +/* Force noinline for valgrind suppression */ +static void broken_halt_test(Eterm bif_arg_2) __attribute__((noinline)); +#endif + +static void broken_halt_test(Eterm bif_arg_2) +{ + /* Ugly ugly code used by bif_SUITE:erlang_halt/1 */ +#if defined(ERTS_HAVE_TRY_CATCH) + erts_get_scheduler_data()->run_queue = NULL; +#endif + erl_exit(ERTS_DUMP_EXIT, "%T", bif_arg_2); +} + BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) { @@ -4040,11 +4054,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) } } else if (ERTS_IS_ATOM_STR("broken_halt", BIF_ARG_1)) { - /* Ugly ugly code used by bif_SUITE:erlang_halt/1 */ -#if defined(ERTS_HAVE_TRY_CATCH) - erts_get_scheduler_data()->run_queue = NULL; -#endif - erl_exit(ERTS_DUMP_EXIT, "%T", BIF_ARG_2); + broken_halt_test(BIF_ARG_2); } else if (ERTS_IS_ATOM_STR("unique_monotonic_integer_state", BIF_ARG_1)) { int res = erts_debug_set_unique_monotonic_integer_state(BIF_ARG_2); diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0 index f79e3ff634..16cecf2dba 100644 --- a/erts/emulator/valgrind/suppress.patched.3.6.0 +++ b/erts/emulator/valgrind/suppress.patched.3.6.0 @@ -362,3 +362,15 @@ fun:async_main ... } +{ +Deliberate invalid read by test case bif_SUITE:erlang_halt +Memcheck:Addr4 +... +fun:erts_print_scheduler_info +... +fun:erl_exit +fun:broken_halt_test +fun:erts_debug_set_internal_state_2 +fun:process_main +} + diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard index b3c77119fb..a1f3f82364 100644 --- a/erts/emulator/valgrind/suppress.standard +++ b/erts/emulator/valgrind/suppress.standard @@ -330,3 +330,15 @@ fun:async_main ... } +{ +Deliberate invalid read by test case bif_SUITE:erlang_halt +Memcheck:Addr4 +... +fun:erts_print_scheduler_info +... +fun:erl_exit +fun:broken_halt_test +fun:erts_debug_set_internal_state_2 +fun:process_main +} + |