diff options
author | Björn Gustavsson <[email protected]> | 2011-03-30 10:41:34 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2011-03-30 10:41:34 +0200 |
commit | ef204e43651715e55ae902176b29026914900cc2 (patch) | |
tree | d47d39bcca05ff6dab9b27f85ba76761015340b5 /erts/emulator/beam/beam_load.c | |
parent | 0bc5994c5aa4001e8a3b63548c7dd735064ecb4d (diff) | |
parent | 9104dc674c265b82728a1b494194fdeea4ad6661 (diff) | |
download | otp-ef204e43651715e55ae902176b29026914900cc2.tar.gz otp-ef204e43651715e55ae902176b29026914900cc2.tar.bz2 otp-ef204e43651715e55ae902176b29026914900cc2.zip |
Merge branch 'bjorn/erts/fix-duplicate-stack-entry/OTP-9163' into dev
* bjorn/erts/fix-duplicate-stack-entry/OTP-9163:
Fix duplicate entries in stacktraces after calling certain BIFs
BEAM loader: Simplify handling of the func_info/3 instruction
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
-rw-r--r-- | erts/emulator/beam/beam_load.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 788cb4209c..c697b1ef31 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -480,8 +480,6 @@ static GenOp* gen_select_literals(LoaderState* stp, GenOpArg S, GenOpArg* Rest); static GenOp* const_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail, GenOpArg Size, GenOpArg* Rest); -static GenOp* gen_func_info(LoaderState* stp, GenOpArg mod, GenOpArg Func, - GenOpArg arity, GenOpArg label); static int freeze_code(LoaderState* stp); @@ -3401,36 +3399,6 @@ const_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail, return op; } - -static GenOp* -gen_func_info(LoaderState* stp, GenOpArg mod, GenOpArg func, - GenOpArg arity, GenOpArg label) -{ - GenOp* fi; - GenOp* op; - - NEW_GENOP(stp, fi); - fi->op = genop_i_func_info_4; - fi->arity = 4; - fi->a[0].type = TAG_u; /* untagged Zero */ - fi->a[0].val = 0; - fi->a[1] = mod; - fi->a[2] = func; - fi->a[3] = arity; - - NEW_GENOP(stp, op); - op->op = genop_label_1; - op->arity = 1; - op->a[0] = label; - - fi->next = op; - op->next = NULL; - - return fi; -} - - - static GenOp* gen_make_fun2(LoaderState* stp, GenOpArg idx) { |