Merge pull request #2042 from bjorng/bjorn/compiler/stacktrace/OTP-15481

Fix unsafe optimization of stack trace building

1 files changed, 25 insertions, 1 deletions

diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index 1b7ef4ddb0..8f9cd9ab1e 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -1189,7 +1189,8 @@ bad_raise(Expr) ->
 test_raise(Expr) ->
     test_raise_1(Expr),
     test_raise_2(Expr),
-    test_raise_3(Expr).
+    test_raise_3(Expr),
+    test_raise_4(Expr).
 
 test_raise_1(Expr) ->
     erase(exception),
@@ -1263,5 +1264,28 @@ do_test_raise_3(Expr) ->
             erlang:raise(exit, {exception,C,E}, Stk)
     end.
 
+test_raise_4(Expr) ->
+    try
+        do_test_raise_4(Expr)
+    catch
+        exit:{exception,C,E,Stk}:Stk ->
+            try
+                Expr()
+            catch
+                C:E:S ->
+                    [StkTop|_] = S,
+                    [StkTop|_] = Stk
+            end
+    end.
+
+do_test_raise_4(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here the stacktrace must be built.
+            erlang:raise(exit, {exception,C,E,Stk}, Stk)
+    end.
+
 
 id(I) -> I.