diff options
author | Niclas Axelsson <[email protected]> | 2011-01-20 15:58:15 +0100 |
---|---|---|
committer | Niclas Axelsson <[email protected]> | 2011-01-20 15:58:22 +0100 |
commit | e0120ba9ae60392cff67d7f17649353f516b1ab3 (patch) | |
tree | b53d856b942192b0dabacc51e4098aa66ab22eb7 /lib | |
parent | faef041a446314bb228e0e8c88a09241df2798f1 (diff) | |
parent | 1791b2d34c966f6b3783d34307078da8bcb7ffbe (diff) | |
download | otp-e0120ba9ae60392cff67d7f17649353f516b1ab3.tar.gz otp-e0120ba9ae60392cff67d7f17649353f516b1ab3.tar.bz2 otp-e0120ba9ae60392cff67d7f17649353f516b1ab3.zip |
Merge branch 'ks/bs_start_match-fails' into dev
* ks/bs_start_match-fails:
Fix erroneous fail info of a hipe_bs_primop
OTP-9036
Diffstat (limited to 'lib')
-rw-r--r-- | lib/hipe/icode/hipe_icode_primops.erl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl index b0fe7eb708..a413531c07 100644 --- a/lib/hipe/icode/hipe_icode_primops.erl +++ b/lib/hipe/icode/hipe_icode_primops.erl @@ -2,19 +2,19 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. 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 %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -26,9 +26,6 @@ %% Notes : %% History : * 2001-06-13 Erik Johansson ([email protected]): %% Created. -%% -%% $Id$ -%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -module(hipe_icode_primops). @@ -197,7 +194,7 @@ fails(#element{}) -> true; %% fails(#gc_test{}) -> ??? fails({hipe_bs_primop, {bs_start_match, _}}) -> true; fails({hipe_bs_primop, {{bs_start_match, bitstr}, _}}) -> true; -fails({hipe_bs_primop, {{bs_start_match, ok_matchstate}, _}}) -> false; +fails({hipe_bs_primop, {{bs_start_match, ok_matchstate}, _}}) -> true; fails({hipe_bs_primop, {bs_get_binary, _, _}}) -> true; fails({hipe_bs_primop, {bs_get_binary_all, _, _}}) -> true; fails({hipe_bs_primop, {bs_get_binary_all_2, _, _}}) -> true; |