diff options
| author | Björn Gustavsson <[email protected]> | 2011-08-05 15:15:43 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-10-11 11:36:36 +0200 |
| commit | 3f8f70e8594ee956dba7edb3602dc9e26e144a69 (patch) | |
| tree | 319ec392c6687f35fa8a5d6e4e3be34fd81d13af /erts/emulator/beam | |
| parent | cac63dbe2da001e050be70664cb6421cdea33430 (diff) | |
| download | otp-3f8f70e8594ee956dba7edb3602dc9e26e144a69.tar.gz otp-3f8f70e8594ee956dba7edb3602dc9e26e144a69.tar.bz2 otp-3f8f70e8594ee956dba7edb3602dc9e26e144a69.zip | |
Merge 'next_instr' and 'is_op' into 'next_instr'
'next_instr' is always followed by 'is_op'.
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 551bc399e7..e858305e9c 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -4250,7 +4250,9 @@ transform_engine(LoaderState* st) op = *pc++; switch (op) { - case TOP_is_op: + case TOP_next_instr: + instr = instr->next; + ap = 0; if (instr == NULL) { /* * We'll need at least one more instruction to decide whether @@ -4437,10 +4439,6 @@ transform_engine(LoaderState* st) case TOP_next_arg: ap++; break; - case TOP_next_instr: - instr = instr->next; - ap = 0; - break; case TOP_commit: instr = instr->next; /* The next_instr was optimized away. */ |