diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-23 16:27:20 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-23 16:27:20 +0100 |
| commit | 2ee19c8a5b44a5b4eeb21f1e6ba6ae4236563c6f (patch) | |
| tree | fbcf02b955d84310dcdabdfe2d36cf9fdcca78fa /lib/hipe/main/hipe.hrl.src | |
| parent | 46be02ff3a36f680013c7e8cd9152adc0e280361 (diff) | |
| parent | bb4624af3e5e1a5979c547e70110a923f1c9d503 (diff) | |
| download | otp-2ee19c8a5b44a5b4eeb21f1e6ba6ae4236563c6f.tar.gz otp-2ee19c8a5b44a5b4eeb21f1e6ba6ae4236563c6f.tar.bz2 otp-2ee19c8a5b44a5b4eeb21f1e6ba6ae4236563c6f.zip | |
Merge branch 'margnus1/hipe-call-elim-crash/PR-1253/OTP-13965' into maint
* margnus1/hipe-call-elim-crash/PR-1253:
hipe_icode_call_elim: Fix cf elimination crash
hipe: Improve error message on internal crashes
Diffstat (limited to 'lib/hipe/main/hipe.hrl.src')
| -rw-r--r-- | lib/hipe/main/hipe.hrl.src | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/hipe/main/hipe.hrl.src b/lib/hipe/main/hipe.hrl.src index 53b59f88f0..08bfd17f30 100644 --- a/lib/hipe/main/hipe.hrl.src +++ b/lib/hipe/main/hipe.hrl.src @@ -1,4 +1,4 @@ -%% -*- erlang-indent-level: 2 -*- +%% -*- mode: erlang; erlang-indent-level: 2 -*- %% %% %CopyrightBegin% %% @@ -70,20 +70,24 @@ code_server:info_msg(?MSGTAG ++ Msg, Args)). -define(untagged_msg(Msg, Args), code_server:info_msg(Msg, Args)). +-define(untagged_error_msg(Msg, Args), + code_server:error_msg(Msg, Args)). -else. -define(msg(Msg, Args), io:format(?MSGTAG ++ Msg, Args)). -define(untagged_msg(Msg, Args), io:format(Msg, Args)). +-define(untagged_error_msg(Msg, Args), + io:format(Msg, Args)). -endif. %% %% Define error and warning messages. %% -define(error_msg(Msg, Args), - code_server:error_msg(?MSGTAG ++ + ?untagged_error_msg(?MSGTAG ++ "Error: [~s:~w]: " ++ Msg, - [?MODULE,?LINE|Args])). + [?MODULE,?LINE|Args])). -define(WARNING_MSG(Msg, Args), ?msg("Warning: [~s:~w]: " ++ Msg, [?MODULE,?LINE|Args])). |