aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorNiclas Axelsson <[email protected]>2011-02-03 16:16:48 +0100
committerNiclas Axelsson <[email protected]>2011-02-03 16:17:02 +0100
commita7ff13dc99a9e83e70ab44c011c184109346fcc3 (patch)
treecbd7112dcbed155555efe1370b71a39086848b3f /lib
parent62dad961329a603110ce0e1d3f62554cc5228152 (diff)
parent64c8d865a359703077a65d102069272315b17843 (diff)
downloadotp-a7ff13dc99a9e83e70ab44c011c184109346fcc3.tar.gz
otp-a7ff13dc99a9e83e70ab44c011c184109346fcc3.tar.bz2
otp-a7ff13dc99a9e83e70ab44c011c184109346fcc3.zip
Merge branch 'ks/bs_add-fail-labels' into dev
* ks/bs_add-fail-labels: Fix translation of bs_add's fail labels OTP-9044
Diffstat (limited to 'lib')
-rw-r--r--lib/hipe/icode/hipe_beam_to_icode.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index 920c94d85c..d7eb035551 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -918,7 +918,7 @@ trans_fun([{bs_add, {f,Lbl}, [Old,New,Unit], Res}|Instructions], Env) ->
Succ = mk_label(new),
[hipe_icode:mk_primop([Temp], '*',
[NewVar, hipe_icode:mk_const(Unit)],
- hipe_icode:label_name(Succ), Lbl),
+ hipe_icode:label_name(Succ), map_label(Lbl)),
Succ]
end
end,
@@ -930,7 +930,7 @@ trans_fun([{bs_add, {f,Lbl}, [Old,New,Unit], Res}|Instructions], Env) ->
[FailLbl,
hipe_icode:mk_fail([hipe_icode:mk_const(badarg)], error)]};
true ->
- {Lbl, []}
+ {map_label(Lbl), []}
end,
IsPos =
[hipe_icode:mk_if('>=', [Temp, hipe_icode:mk_const(0)],