From e44c3bcfea153cfecb5d096be6fad8f830f91198 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Thu, 7 May 2015 15:38:08 +0200
Subject: dialyzer: document the type identifier()

---
 lib/hipe/cerl/erl_types.erl | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'lib/hipe')

diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 798212d5f9..14335cf635 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -67,7 +67,6 @@
 	 t_cons/2,
 	 t_cons_hd/1, t_cons_hd/2,
 	 t_cons_tl/1, t_cons_tl/2,
-	 t_constant/0,
          t_contains_opaque/1, t_contains_opaque/2,
          t_decorate_with_opaque/3,
 	 t_elements/1,
@@ -118,7 +117,6 @@
 	 %% t_is_byte/1,
 	 %% t_is_char/1,
 	 t_is_cons/1, t_is_cons/2,
-	 t_is_constant/1,
 	 t_is_equal/2,
 	 t_is_fixnum/1,
 	 t_is_float/1, t_is_float/2,
@@ -1748,17 +1746,6 @@ is_tuple1(_) -> false.
 t_bitstrlist() ->
   t_iolist(1, t_bitstr()).
 
-%% XXX. To be removed.
--spec t_constant() -> erl_type().
-
-t_constant() ->
-  t_sup([t_number(), t_identifier(), t_atom(), t_fun(), t_binary()]).
-
--spec t_is_constant(erl_type()) -> boolean().
-
-t_is_constant(X) ->
-  t_is_subtype(X, t_constant()).
-
 -spec t_arity() -> erl_type().
 
 t_arity() ->
-- 
cgit v1.2.3


From e09dd66dc4d89c62ddfd8c19791f9678d5d787c6 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 12 May 2015 18:18:55 +0200
Subject: Prepare release

---
 lib/hipe/doc/src/notes.xml | 36 ++++++++++++++++++++++++++++++++++++
 lib/hipe/vsn.mk            |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'lib/hipe')

diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 8d3358533b..1cc8558fe8 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -30,6 +30,42 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a minor bug in the handling of opaque types. </p>
+          <p>
+	    Own Id: OTP-12666</p>
+        </item>
+        <item>
+          <p>
+	    Fix hipe bug when matching a "writable" binary. The bug
+	    has been seen to sometimes cause a failed binary matching
+	    of a correct utf8 character, but other symptoms are also
+	    possible.</p>
+          <p>
+	    Own Id: OTP-12667</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved error handling when memory allocation for HiPE
+	    code fails.</p>
+          <p>
+	    Own Id: OTP-12448</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.11.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 60b4e0559b..e507ae933f 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.11.3
+HIPE_VSN = 3.12
-- 
cgit v1.2.3


From 9a81b28598fadc44bf506354c9227e41aac786f6 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Wed, 13 May 2015 09:40:16 +0200
Subject: Revert "Prepare release"

This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
---
 lib/hipe/doc/src/notes.xml | 36 ------------------------------------
 lib/hipe/vsn.mk            |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)

(limited to 'lib/hipe')

diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 1cc8558fe8..8d3358533b 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -30,42 +30,6 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
-<section><title>Hipe 3.12</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Fix a minor bug in the handling of opaque types. </p>
-          <p>
-	    Own Id: OTP-12666</p>
-        </item>
-        <item>
-          <p>
-	    Fix hipe bug when matching a "writable" binary. The bug
-	    has been seen to sometimes cause a failed binary matching
-	    of a correct utf8 character, but other symptoms are also
-	    possible.</p>
-          <p>
-	    Own Id: OTP-12667</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Improved error handling when memory allocation for HiPE
-	    code fails.</p>
-          <p>
-	    Own Id: OTP-12448</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Hipe 3.11.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index e507ae933f..60b4e0559b 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.12
+HIPE_VSN = 3.11.3
-- 
cgit v1.2.3