diff options
| author | Sverker Eriksson <[email protected]> | 2015-08-31 16:59:13 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-08-31 16:59:13 +0200 |
| commit | 3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9 (patch) | |
| tree | cb9bae63100a58fd18d04744acfda216acb244f0 /lib/dialyzer/src | |
| parent | bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6 (diff) | |
| parent | 6e3a0870ebd992ed410298e859066894134be9f6 (diff) | |
| download | otp-3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9.tar.gz otp-3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9.tar.bz2 otp-3af9e6ef9bd6a9e9faf0e5bf683f4f1c5c0c0ca9.zip | |
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
Diffstat (limited to 'lib/dialyzer/src')
| -rw-r--r-- | lib/dialyzer/src/dialyzer.app.src | 2 | ||||
| -rw-r--r-- | lib/dialyzer/src/dialyzer_cl.erl | 6 |
2 files changed, 4 insertions, 4 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), |