Merge branch 'sverk/hipe-fix-literal-crc' into maint

* sverk/hipe-fix-literal-crc:
  erts,hipe,dialyzer: Fix hipe checkum of target runtime system
  erts: Change THE_NON_VALUE to not be hard coded in hipe compiler

OTP-12962
OTP-12963
OTP-12964

9 files changed, 21 insertions, 11 deletions

diff --git a/lib/dialyzer/src/dialyzer.app.src b/lib/dialyzer/src/dialyzer.app.src
index 6718178fae..8ac6dc1367 100644
--- a/lib/dialyzer/src/dialyzer.app.src
+++ b/lib/dialyzer/src/dialyzer.app.src
@@ -47,5 +47,5 @@
   {applications, [compiler, gs, hipe, kernel, stdlib, wx]},
   {env, []},
   {runtime_dependencies, ["wx-1.2","syntax_tools-1.6.14","stdlib-2.5",
-			  "kernel-3.0","hipe-3.10.3","erts-7.0",
+			  "kernel-3.0","hipe-3.13","erts-7.0",
 			  "compiler-5.0"]}]}.
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 55302d5869..4116866916 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -547,13 +547,13 @@ hc(Mod, Cache) ->
 
 hc_cache(Mod) ->
   CacheBase = cache_base_dir(),
-  %% Use HiPE architecture and version in directory name, to avoid
-  %% clashes between incompatible binaries.
+  %% Use HiPE architecture, version and erts checksum in directory name,
+  %% to avoid clashes between incompatible binaries.
   HipeArchVersion =
     lists:concat(
       [erlang:system_info(hipe_architecture), "-",
        hipe:version(), "-",
-       hipe_bifs:system_crc()]),
+       hipe:erts_checksum()]),
   CacheDir = filename:join(CacheBase, HipeArchVersion),
   OrigBeamFile = code:which(Mod),
   {ok, {Mod, <<Checksum:128>>}} = beam_lib:md5(OrigBeamFile),
diff --git a/lib/hipe/arm/hipe_arm_assemble.erl b/lib/hipe/arm/hipe_arm_assemble.erl
index 7859e2d4a8..5f98c6593e 100644
--- a/lib/hipe/arm/hipe_arm_assemble.erl
+++ b/lib/hipe/arm/hipe_arm_assemble.erl
@@ -48,7 +48,7 @@ assemble(CompiledCode, Closures, Exports, Options) ->
   DataRelocs = hipe_pack_constants:mk_data_relocs(RefsFromConsts, LabelMap),
   SSE = hipe_pack_constants:slim_sorted_exportmap(ExportMap,Closures,Exports),
   SlimRefs = hipe_pack_constants:slim_refs(AccRefs),
-  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_SYSTEM_CRC},
+  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_ERTS_CHECKSUM},
 			ConstAlign, ConstSize,
 			SC,
 			DataRelocs, % nee LM, LabelMap
diff --git a/lib/hipe/llvm/hipe_llvm_merge.erl b/lib/hipe/llvm/hipe_llvm_merge.erl
index 3ababfc21a..6e891ac3b0 100644
--- a/lib/hipe/llvm/hipe_llvm_merge.erl
+++ b/lib/hipe/llvm/hipe_llvm_merge.erl
@@ -27,7 +27,7 @@ finalize(CompiledCode, Closures, Exports) ->
   DataRelocs = hipe_pack_constants:mk_data_relocs(RefsFromConsts, LabelMap),
   SSE = hipe_pack_constants:slim_sorted_exportmap(ExportMap, Closures, Exports),
   SlimRefs = hipe_pack_constants:slim_refs(AccRefs),
-  term_to_binary([{?VERSION_STRING(),?HIPE_SYSTEM_CRC},
+  term_to_binary([{?VERSION_STRING(),?HIPE_ERTS_CHECKSUM},
 		  ConstAlign, ConstSize,
 		  SC,  % ConstMap
 		  DataRelocs, % LabelMap
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src
index 008393e63c..aa86b6dc5b 100644
--- a/lib/hipe/main/hipe.app.src
+++ b/lib/hipe/main/hipe.app.src
@@ -225,4 +225,4 @@
   {applications, [kernel,stdlib]},
   {env, []},
   {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-2.5","kernel-3.0",
-			  "erts-7.0","compiler-5.0"]}]}.
+			  "erts-7.1","compiler-5.0"]}]}.
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index ce4f49ffa7..1a4bbf179f 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -208,7 +208,8 @@
 	 help_options/0,
 	 help_option/1,
 	 help_debug_options/0,
-	 version/0]).
+	 version/0,
+	 erts_checksum/0]).
 
 -ifndef(DEBUG).
 -define(DEBUG,true).
@@ -216,6 +217,7 @@
 
 -include("hipe.hrl").
 -include("../../compiler/src/beam_disasm.hrl").
+-include("../rtl/hipe_literals.hrl").
 
 %%-------------------------------------------------------------------
 %% Basic type declaration for exported functions of the 'hipe' module
@@ -1032,6 +1034,12 @@ post(Res, Icode, Options) ->
 version() ->
   ?VERSION_STRING().
 
+%% @doc Returns checksum identifying the target runtime system.
+-spec erts_checksum() -> integer().
+
+erts_checksum() ->
+  ?HIPE_ERTS_CHECKSUM.
+
 %% --------------------------------------------------------------------
 %% D O C U M E N T A T I O N   -   H E L P 
 %% --------------------------------------------------------------------
@@ -1062,6 +1070,8 @@ help() ->
     "     Prints a description of debug options.\n" ++
     "   version() ->\n" ++
     "     Returns the HiPE version as a string'.\n" ++
+    "   erts_checksum() ->\n" ++
+    "     Returns a checksum identifying the target runtime system.\n" ++
     "\n" ++
     " For HiPE developers only:\n" ++
     "  Use `help_hiper()' for information about HiPE's low-level interface\n",
diff --git a/lib/hipe/ppc/hipe_ppc_assemble.erl b/lib/hipe/ppc/hipe_ppc_assemble.erl
index 4d419978ef..00f28d60e4 100644
--- a/lib/hipe/ppc/hipe_ppc_assemble.erl
+++ b/lib/hipe/ppc/hipe_ppc_assemble.erl
@@ -50,7 +50,7 @@ assemble(CompiledCode, Closures, Exports, Options) ->
   DataRelocs = hipe_pack_constants:mk_data_relocs(RefsFromConsts, LabelMap),
   SSE = hipe_pack_constants:slim_sorted_exportmap(ExportMap,Closures,Exports),
   SlimRefs = hipe_pack_constants:slim_refs(AccRefs),
-  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_SYSTEM_CRC},
+  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_ERTS_CHECKSUM},
 			ConstAlign, ConstSize,
 			SC,
 			DataRelocs, % nee LM, LabelMap
diff --git a/lib/hipe/sparc/hipe_sparc_assemble.erl b/lib/hipe/sparc/hipe_sparc_assemble.erl
index 5424a6c965..0e27c78416 100644
--- a/lib/hipe/sparc/hipe_sparc_assemble.erl
+++ b/lib/hipe/sparc/hipe_sparc_assemble.erl
@@ -49,7 +49,7 @@ assemble(CompiledCode, Closures, Exports, Options) ->
   DataRelocs = hipe_pack_constants:mk_data_relocs(RefsFromConsts, LabelMap),
   SSE = hipe_pack_constants:slim_sorted_exportmap(ExportMap,Closures,Exports),
   SlimRefs = hipe_pack_constants:slim_refs(AccRefs),
-  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_SYSTEM_CRC},
+  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_ERTS_CHECKSUM},
 			ConstAlign, ConstSize,
 			SC,
 			DataRelocs, % nee LM, LabelMap
diff --git a/lib/hipe/x86/hipe_x86_assemble.erl b/lib/hipe/x86/hipe_x86_assemble.erl
index 4ffa3d35ba..695ce16887 100644
--- a/lib/hipe/x86/hipe_x86_assemble.erl
+++ b/lib/hipe/x86/hipe_x86_assemble.erl
@@ -83,7 +83,7 @@ assemble(CompiledCode, Closures, Exports, Options) ->
   DataRelocs = hipe_pack_constants:mk_data_relocs(RefsFromConsts, LabelMap),
   SSE = hipe_pack_constants:slim_sorted_exportmap(ExportMap,Closures,Exports),
   SlimRefs = hipe_pack_constants:slim_refs(AccRefs),
-  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_SYSTEM_CRC},
+  Bin = term_to_binary([{?VERSION_STRING(),?HIPE_ERTS_CHECKSUM},
 			ConstAlign, ConstSize,
 			SC,
 			DataRelocs, % nee LM, LabelMap