3 files changed, 72 insertions, 2 deletions
diff --git a/lib/hipe/test/Makefile b/lib/hipe/test/Makefile
index d781e4f9be..09f4fd2129 100644
--- a/lib/hipe/test/Makefile
+++ b/lib/hipe/test/Makefile
@@ -36,7 +36,7 @@ RELSYSDIR = $(RELEASE_PATH)/hipe_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/hipe/test/basic_SUITE_data/basic_floats.erl b/lib/hipe/test/basic_SUITE_data/basic_floats.erl
index eec175075a..ce28f6e156 100644
--- a/lib/hipe/test/basic_SUITE_data/basic_floats.erl
+++ b/lib/hipe/test/basic_SUITE_data/basic_floats.erl
@@ -18,6 +18,8 @@ test() ->
   ok = test_catch_fp_conv(),
   ok = test_fp_with_fp_exceptions(),
   %% ok = test_fmt_double_fpe_leak(),    % this requires printing
+  ok = test_icode_type_crash(),
+  ok = test_icode_type_crash_2(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -178,3 +180,71 @@ test_fmt_double_fpe_leak(X, Y) ->
   math:log10(Y).
 
 int_two() -> 2.
+
+%%--------------------------------------------------------------------
+%% Contains code which confuses the icode_type analysis and results
+%% in a compiler crash.  Stipped down from code sent by Paul Guyot.
+%% Compiles alright with the option 'no_icode_type' but that defeats
+%% the purpose of the test.
+
+test_icode_type_crash() ->
+  Fun = f(1, 2, 3),
+  42.0 = Fun(),
+  ok.
+
+f(A, B, C) ->
+  fun () ->
+      X = case A of
+	    0 -> 1 / B;
+	    _ -> A / C
+	  end,
+      Y = case B of
+	    a -> 1.0;
+	    b -> 2.0;
+	    _ -> 6.0
+	  end,
+      Z = case C of
+	    c -> 0.1 * X;
+	    _ -> 7.0
+	  end,
+      Y * Z
+  end.
+
+%%--------------------------------------------------------------------
+%% Contains another case that crashed hipe_icode_fp. This sample was
+%% sent by Mattias Jansson (25 Nov 2015). It compiled alright with the
+%% option 'no_icode_type' but that defeats the purpose of the test.
+%% Unfortunately, the execution of this code goes into an infinite
+%% loop, even if the map in the second argument of eat_what/2 gets the
+%% appropriate key-value pairs. Still, it is retained as a test
+%% because it exposed a different crash than test_icode_type_crash/0.
+
+test_icode_type_crash_2() ->
+  {'EXIT', {function_clause, _}} = (catch eat()),
+  ok.
+
+eat() ->
+  eat_what(1.0, #{}).
+
+eat_what(Factor, #{rat_type := LT} = Rat) ->
+  #{cheese := Cheese} = Rat,
+  UnitCheese = Cheese / 2,
+  RetA = case eat() of
+	   {full, RetA1} ->
+	     CheeseB2 = min(RetA1, UnitCheese) * Factor,
+	     case eat() of
+	       full -> {win, RetA1};
+	       hungry -> {partial, RetA1 - CheeseB2}
+	     end;
+	   AOther -> AOther
+	 end,
+  RetB = case eat() of
+	   {full, RetB1} ->
+	     CheeseA2 = min(RetB1, UnitCheese) * Factor,
+	     rat:init(single, LT, CheeseA2),
+	     case eat() of
+	       full -> {full, RetB1};
+	       hungry -> {hungry, RetB1 - CheeseA2}
+	     end
+	 end,
+  {RetA, RetB}.
diff --git a/lib/hipe/test/bs_SUITE_data/bs_utf.erl b/lib/hipe/test/bs_SUITE_data/bs_utf.erl
index 24526f574d..368ad0cd20 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_utf.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_utf.erl
@@ -9,7 +9,7 @@
 
 -export([test/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test() ->
   ok = utf8_cm65(),