diff options
| author | Erlang/OTP <[email protected]> | 2010-04-01 05:34:09 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-01 05:34:09 +0000 |
| commit | 263643a357e7a11724c599045ca35ba9aef2438c (patch) | |
| tree | 659f70100c5d868b827ff13ee924bf7d8ba9e590 /lib/compiler/src/v3_codegen.erl | |
| parent | 943ad16fa4b6335b6e170cc94fc7df9041ff4e47 (diff) | |
| parent | f958b8bdbc63c5cbc60502047a4fab548fe9fd89 (diff) | |
| download | otp-263643a357e7a11724c599045ca35ba9aef2438c.tar.gz otp-263643a357e7a11724c599045ca35ba9aef2438c.tar.bz2 otp-263643a357e7a11724c599045ca35ba9aef2438c.zip | |
Merge branch 'bg/compiler-inliner' into dev
* bg/compiler-inliner:
pmod_SUITE: Again test inlining parameterized modules
compiler tests: Cope with missing args in function_clause for native code
compiler tests: Compile a few more modules with 'inline'
Consistently rewrite an inlined function_clause exception to case_clause
compiler tests: Test the 'inline' option better
compiler: Suppress bs_context_to_binary/1 for a literal operand
compiler: Fix binary matching bug in the inliner
sys_core_inline: Don't generated multiple compiler_generated annos
OTP-8552 bg/compiler-inliner
Several problems in the inliner have been fixed.
Diffstat (limited to 'lib/compiler/src/v3_codegen.erl')
| -rw-r--r-- | lib/compiler/src/v3_codegen.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl index 1f05b4f6b4..948937c438 100644 --- a/lib/compiler/src/v3_codegen.erl +++ b/lib/compiler/src/v3_codegen.erl @@ -1190,7 +1190,12 @@ trap_bif(_, _, _) -> false. bif_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) -> [Src] = cg_reg_args([Src0], Bef), - {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0}; + case is_register(Src) of + false -> + {[],clear_dead(Bef, Le#l.i, Vdb), St0}; + true -> + {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0} + end; bif_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) -> [New,Tuple,{integer,Index1}] = cg_reg_args([New0,Tuple0,Index0], Bef), Index = Index1-1, @@ -2019,6 +2024,10 @@ fetch_stack(V, [_|Stk], I) -> fetch_stack(V, Stk, I+1). on_stack(V, Stk) -> keymember(V, 1, Stk). +is_register({x,_}) -> true; +is_register({yy,_}) -> true; +is_register(_) -> false. + %% put_catch(CatchTag, Stack) -> Stack' %% drop_catch(CatchTag, Stack) -> Stack' %% Special interface for putting and removing catch tags, to ensure that |