File 0224-compiler-Preserve-extended-error-informati... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0224-compiler-Preserve-extended-error-information.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From bf115ee06a90a7d9af92c12e89a2bee39832e1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 23 Nov 2021 09:11:50 +0100
Subject: [PATCH] compiler: Preserve extended error information

The compiler currently replaces known failing calls with a call to
`error(badarg)`. Example:

foobar() ->
        atom_to_binary(42).

The compiler rewrites that to:

foobar() ->
        error(badarg).

With the introduction of extended error information (EEP 54), that
"optimization" results in no extended error information being shown:

1> t:foobar().
    ** exception error: bad argument
         in function  t:foobar/0 (t.erl, line 5)

To ensure that extended error information is always shown, update
the compiler so that it will keep the known failing call (but still
emit a warning). Thus:

2> t:foobar().
    ** exception error: bad argument
         in function  atom_to_binary/1
            called as atom_to_binary(42)
            *** argument 1: not an atom

Closes #5440.
---
 lib/compiler/src/sys_core_fold.erl   | 12 +++++-------
 lib/compiler/test/warnings_SUITE.erl | 13 ++-----------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 01e9987196..5cc7529469 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -897,8 +897,9 @@ fold_lit_args(Call, Module, Name, Args0) ->
 	    end
     catch
 	error:Reason ->
-	    %% Evaluation of the function failed. Warn and replace
-	    %% the call with a call to erlang:error/1.
+            %% Evaluation of the function failed. Warn but keep
+            %% the call to ensure that extended error information
+            %% will be available at runtime.
 	    eval_failure(Call, Reason)
     end.
 
@@ -959,15 +960,12 @@ eval_append(Call, X, Y) ->
     Call#c_call{args=[X,Y]}.			%Rebuild call arguments.
 
 %% eval_failure(Call, Reason) -> Core.
-%%  Warn for a call that will fail and replace the call with
-%%  a call to erlang:error(Reason).
+%%  Warn for a call that will fail but keep the call.
 %%
 eval_failure(Call, Reason) ->
     Classified = classify_call(Call),
     add_warning(Call, {failed,{eval_failure,Classified,Reason}}),
-    Call#c_call{module=#c_literal{val=erlang},
-		name=#c_literal{val=error},
-		args=[#c_literal{val=Reason}]}.
+    Call.
 
 %% simplify_apply(Call0, Mod, Func, Args) -> Call
 %%  Simplify an apply/3 to a call if the number of arguments
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index 82ab077cc9..2a287eae9e 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -244,16 +244,12 @@ guard(Config) when is_list(Config) ->
            ">>,
 	   [nowarn_unused_vars],
 	   {warnings,
-            [{{2,15},sys_core_fold,{nomatch,guard}},
-             {{2,15},sys_core_fold,{nomatch,no_clause}},
-             {{2,28},sys_core_fold,
+            [{{2,28},sys_core_fold,
               {failed,{eval_failure,
                        {erlang,element,2},
                        badarg}}},
              {{4,15},sys_core_fold,{nomatch,guard}},
              {{4,15},sys_core_fold,{nomatch,no_clause}},
-             {{6,15},sys_core_fold,{nomatch,guard}},
-             {{6,15},sys_core_fold,{nomatch,no_clause}},
              {{6,26},sys_core_fold,
               {failed,
                {eval_failure,
@@ -284,19 +280,14 @@ bad_arith(Config) when is_list(Config) ->
            ">>,
 	   [],
 	   {warnings,
-            [{{3,19},sys_core_fold,{nomatch,guard}},
-             {{3,21},sys_core_fold,
+            [{{3,21},sys_core_fold,
               {failed,{eval_failure,
                        {erlang,'+',2},
                        badarith}}},
-             {{9,19},sys_core_fold,
-              {ignored,{no_effect,{erlang,is_integer,1}}}},
-             {{9,19},sys_core_fold,{nomatch,guard}},
              {{9,36},sys_core_fold,
               {failed,{eval_failure,
                        {erlang,'+',2},
                        badarith}}},
-             {{10,19},sys_core_fold,{nomatch,guard}},
              {{10,21},sys_core_fold,
               {failed,{eval_failure,
                        {erlang,'+',2},
-- 
2.31.1

Places

File 0224-compiler-Preserve-extended-error-information.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places