diff options
| author | Sverker Eriksson <[email protected]> | 2017-12-20 17:18:31 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-01-03 16:43:31 +0100 |
| commit | 3d21f793538927ae88f78504a11dd898e8ca1a7a (patch) | |
| tree | 84e0a989a53636e3a3f3bc2b84332d4318a3266d /lib/hipe | |
| parent | 44b09e036b31b29dddc3b178e8f6b9fc96a9a874 (diff) | |
| download | otp-3d21f793538927ae88f78504a11dd898e8ca1a7a.tar.gz otp-3d21f793538927ae88f78504a11dd898e8ca1a7a.tar.bz2 otp-3d21f793538927ae88f78504a11dd898e8ca1a7a.zip | |
Fix bug in hipe primop bs_put_utf8
by preventing it from doing GC, which generated code relies on.
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/main/hipe.app.src | 2 | ||||
| -rw-r--r-- | lib/hipe/rtl/hipe_rtl_binary_construct.erl | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src index fb750dd418..eef4b9a34f 100644 --- a/lib/hipe/main/hipe.app.src +++ b/lib/hipe/main/hipe.app.src @@ -236,4 +236,4 @@ {applications, [kernel,stdlib]}, {env, []}, {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-3.4","kernel-5.3", - "erts-9.2","compiler-5.0"]}]}. + "erts-9.3","compiler-5.0"]}]}. diff --git a/lib/hipe/rtl/hipe_rtl_binary_construct.erl b/lib/hipe/rtl/hipe_rtl_binary_construct.erl index bc215e3abe..ec7044a2b9 100644 --- a/lib/hipe/rtl/hipe_rtl_binary_construct.erl +++ b/lib/hipe/rtl/hipe_rtl_binary_construct.erl @@ -168,9 +168,13 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab bs_put_utf8 -> [_Src, _Base, _Offset] = Args, - NewDsts = get_real(Dst), - [hipe_rtl:mk_call(NewDsts, bs_put_utf8, Args, - TrueLblName, FalseLblName, not_remote)]; + [NewOffs] = get_real(Dst), + RetLbl = hipe_rtl:mk_new_label(), + [hipe_rtl:mk_call([NewOffs], bs_put_utf8, Args, + hipe_rtl:label_name(RetLbl), [], not_remote), + RetLbl, + hipe_rtl:mk_branch(NewOffs, ne, hipe_rtl:mk_imm(0), + TrueLblName, FalseLblName, 0.99)]; bs_utf16_size -> case Dst of |