diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-31 16:17:19 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-31 16:17:19 +0200 |
| commit | 28bb4559b2fada7028e253bb842b239ec8891345 (patch) | |
| tree | 0fc16a93ee43d1259f18ac57723647503ed940f0 | |
| parent | 04b4086965b628c43d31eec3063e2d614914276b (diff) | |
| parent | b2d97b781bb8f73d58700b8be224147923a1ae5d (diff) | |
| download | otp-28bb4559b2fada7028e253bb842b239ec8891345.tar.gz otp-28bb4559b2fada7028e253bb842b239ec8891345.tar.bz2 otp-28bb4559b2fada7028e253bb842b239ec8891345.zip | |
Merge branch 'maint'
| -rw-r--r-- | bootstrap/lib/compiler/ebin/beam_a.beam | bin | 2236 -> 2288 bytes | |||
| -rw-r--r-- | lib/compiler/src/beam_a.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/lib/compiler/ebin/beam_a.beam b/bootstrap/lib/compiler/ebin/beam_a.beam Binary files differindex fd53a2e0f9..a4965abd48 100644 --- a/bootstrap/lib/compiler/ebin/beam_a.beam +++ b/bootstrap/lib/compiler/ebin/beam_a.beam diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl index 1c51226314..b348e854a0 100644 --- a/lib/compiler/src/beam_a.erl +++ b/lib/compiler/src/beam_a.erl @@ -70,8 +70,8 @@ rename_instr({bs_put_utf16=I,F,Fl,Src}) -> {bs_put,F,{I,Fl},[Src]}; rename_instr({bs_put_utf32=I,F,Fl,Src}) -> {bs_put,F,{I,Fl},[Src]}; -%% rename_instr({bs_put_string,_,_}=I) -> -%% {bs_put,{f,0},I,[]}; +rename_instr({bs_put_string,_,_}=I) -> + {bs_put,{f,0},I,[]}; rename_instr({bs_add=I,F,[Src1,Src2,U],Dst}) when is_integer(U) -> {bif,I,F,[Src1,Src2,{integer,U}],Dst}; rename_instr({bs_utf8_size=I,F,Src,Dst}) -> |