diff options
| author | Björn Gustavsson <[email protected]> | 2015-02-05 09:50:35 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-02-05 09:50:35 +0100 |
| commit | ca8b78e997aef12f6e6c883c68db2ffef5986ae5 (patch) | |
| tree | e748953159acd8737ea883c5e5449f374d416577 /erts | |
| parent | 9d99c5fde589a98af4b173f816f648716b3127b8 (diff) | |
| parent | 4babd738633953a09ce3314ed89d0933063b4ef7 (diff) | |
| download | otp-ca8b78e997aef12f6e6c883c68db2ffef5986ae5.tar.gz otp-ca8b78e997aef12f6e6c883c68db2ffef5986ae5.tar.bz2 otp-ca8b78e997aef12f6e6c883c68db2ffef5986ae5.zip | |
Merge branch 'bjorn/compiler/dup-bug-fix/OTP-12453'
* bjorn/compiler/dup-bug-fix/OTP-12453:
Teach case_opt/3 to avoid unnecessary building
sys_core_fold: Optimize let statements more aggressively
Suppress warnings for expressions that are assigned to '_'
trace_bif_SUITE: Ensure that a call to time/0 is not removed
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/trace_bif_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/test/trace_bif_SUITE.erl b/erts/emulator/test/trace_bif_SUITE.erl index 2c78aa394f..063e348836 100644 --- a/erts/emulator/test/trace_bif_SUITE.erl +++ b/erts/emulator/test/trace_bif_SUITE.erl @@ -260,7 +260,9 @@ bif_process() -> apply(erlang, Name, Args), bif_process(); {do_time_bif} -> - _ = time(), %Assignment tells compiler to keep call. + %% Match the return value to ensure that the time() call + %% is not optimized away. + {_,_,_} = time(), bif_process(); {do_statistics_bif} -> statistics(runtime), |