diff options
author | Björn Gustavsson <[email protected]> | 2017-12-08 10:40:55 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2017-12-08 10:40:55 +0100 |
commit | 70c5dccad3d839a455682e22ac187e325c792112 (patch) | |
tree | 2e507e879306ee5dc89d270b69f87fac76e6a5eb /lib/hipe/icode/hipe_beam_to_icode.erl | |
parent | 842d3c0be0d2095c8d1e79ea3d672e191f7f954e (diff) | |
parent | 9dce8fe582cecb586375dafff4b84c11a1b3ac7e (diff) | |
download | otp-70c5dccad3d839a455682e22ac187e325c792112.tar.gz otp-70c5dccad3d839a455682e22ac187e325c792112.tar.bz2 otp-70c5dccad3d839a455682e22ac187e325c792112.zip |
Merge pull request #1634 from bjorng/bjorn/get_stacktrace-syntax/OTP-14692
Add syntax in try/catch to retrieve the stacktrace directly
Diffstat (limited to 'lib/hipe/icode/hipe_beam_to_icode.erl')
-rw-r--r-- | lib/hipe/icode/hipe_beam_to_icode.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl index 4c7fbad711..7ff9fd83eb 100644 --- a/lib/hipe/icode/hipe_beam_to_icode.erl +++ b/lib/hipe/icode/hipe_beam_to_icode.erl @@ -1159,6 +1159,11 @@ trans_fun([{put_map_exact,{f,Lbl},Map,Dst,_N,{list,Pairs}}|Instructions], Env) - gen_put_map_instrs(new, exact, TempMapVar, Dst, new, Pairs, Env1) end, [MapMove, TempMapMove, PutInstructions | trans_fun(Instructions, Env2)]; +%%--- build_stacktrace --- +trans_fun([build_stacktrace|Instructions], Env) -> + Vars = [mk_var({x,0})], %{x,0} is implict arg and dst + [hipe_icode:mk_primop(Vars,build_stacktrace,Vars), + trans_fun(Instructions, Env)]; %%-------------------------------------------------------------------- %%--- ERROR HANDLING --- %%-------------------------------------------------------------------- |