From d334837dfe34cc4085d29ff50293b6c1f3b15441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 13 Mar 2014 17:44:57 +0100
Subject: hipe: Properly identify map() type form terms

---
 lib/hipe/cerl/erl_types.erl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/hipe')

diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 32390045e3..aa69b57fa2 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -218,6 +218,10 @@
 %%-define(DO_ERL_TYPES_TEST, true).
 -compile({no_auto_import,[min/2,max/2]}).
 
+%% HiPE does not understand Maps
+%% (guard function is_map/1 in t_from_term/1)
+-compile(no_native).
+
 -ifdef(DO_ERL_TYPES_TEST).
 -export([test/0]).
 -else.
@@ -2156,6 +2160,7 @@ t_from_term(T) when is_integer(T) ->   t_integer(T);
 t_from_term(T) when is_pid(T) ->       t_pid();
 t_from_term(T) when is_port(T) ->      t_port();
 t_from_term(T) when is_reference(T) -> t_reference();
+t_from_term(T) when is_map(T) ->       t_map();
 t_from_term(T) when is_tuple(T) ->
   t_tuple([t_from_term(E) || E <- tuple_to_list(T)]).
 
-- 
cgit v1.2.3