3 files changed, 24 insertions, 38 deletions
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index a9dc14f78d..fde266e5b0 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -45,7 +45,7 @@ groups() ->
        {group,vsn},otp_2380,otp_4790,
        const_list_256,live_var,convopts,
        catch_in_catch,redundant_case,long_string,otp_5076,
-       complex_guard,otp_5092,otp_5151,otp_5235,otp_5244,
+       otp_5092,otp_5151,otp_5235,otp_5244,
        trycatch_4,opt_crash,otp_5404,otp_5436,otp_5481,
        otp_5553,otp_5632,otp_5714,otp_5872,otp_6121,
        otp_6121a,otp_6121b,otp_7202,otp_7345,on_load,
@@ -98,9 +98,6 @@ end_per_group(_GroupName, Config) ->
 ?comp(const_list_256).
 
 ?comp(otp_5076).
-
-?comp(complex_guard).
-
 ?comp(otp_5092).
 ?comp(otp_5151).
 
diff --git a/lib/compiler/test/compilation_SUITE_data/complex_guard.erl b/lib/compiler/test/compilation_SUITE_data/complex_guard.erl
deleted file mode 100644
index f1b88c2bd2..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/complex_guard.erl
+++ /dev/null
@@ -1,32 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(complex_guard).
-
--compile(export_all).
-
-?MODULE() ->
-    ok.
-
-f(X1,Y1,Z1) ->
-    if
-	((X1 =:= 4) or (X1 =:= 5)) and ((Y1 =:= 4) or (Y1 =:= 5)) and ((Z1 =:= 4) or (Z1 =:= 5)) or ((X1 =:= 1) or (X1 =:= 2) or (X1 =:= 3)) and ((Y1 =:= 1) or (Y1 =:= 2) or (Y1 =:= 3)) and ((Z1 =:= 1) or (Z1 =:= 2) or (Z1 =:= 3)) ->
-	    true
-    end.
-
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index ffbf59f0ee..13d274d98a 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -28,7 +28,7 @@
 	 or_guard/1,more_or_guards/1,
 	 complex_or_guards/1,and_guard/1,
 	 xor_guard/1,more_xor_guards/1,
-	 old_guard_tests/1,
+	 old_guard_tests/1,complex_guard/1,
 	 build_in_guard/1,gbif/1,
 	 t_is_boolean/1,is_function_2/1,
 	 tricky/1,rel_ops/1,rel_op_combinations/1,literal_type_tests/1,
@@ -48,7 +48,8 @@ groups() ->
       [misc,const_cond,basic_not,complex_not,nested_nots,
        semicolon,complex_semicolon,comma,or_guard,
        more_or_guards,complex_or_guards,and_guard,xor_guard,
-       more_xor_guards,build_in_guard,old_guard_tests,gbif,
+       more_xor_guards,build_in_guard,
+       old_guard_tests,complex_guard,gbif,
        t_is_boolean,is_function_2,tricky,
        rel_ops,rel_op_combinations,
        literal_type_tests,basic_andalso_orelse,traverse_dcd,
@@ -947,6 +948,26 @@ og(_) -> what.
 on(V) when number(V) -> number;
 on(_) -> not_number.
 
+complex_guard(_Config) ->
+    _ = [true = do_complex_guard(X, Y, Z) ||
+	    X <- [4,5], Y <- [4,5], Z <- [4,5]],
+    _ = [true = do_complex_guard(X, Y, Z) ||
+	    X <- [1,2,3], Y <- [1,2,3], Z <- [1,2,3]],
+    _ = [catch do_complex_guard(X, Y, Z) ||
+	    X <- [1,2,3,4,5], Y <- [0,6], Z <- [1,2,3,4,5]],
+    ok.
+
+do_complex_guard(X1, Y1, Z1) ->
+    if
+	((X1 =:= 4) or (X1 =:= 5)) and
+	((Y1 =:= 4) or (Y1 =:= 5)) and
+	((Z1 =:= 4) or (Z1 =:= 5)) or
+	((X1 =:= 1) or (X1 =:= 2) or (X1 =:= 3)) and
+	((Y1 =:= 1) or (Y1 =:= 2) or (Y1 =:= 3)) and
+	((Z1 =:= 1) or (Z1 =:= 2) or (Z1 =:= 3)) ->
+	    true
+    end.
+
 gbif(Config) when is_list(Config) ->
     error = gbif_1(1, {false,true}),
     ok = gbif_1(2, {false,true}),