diff options
| author | Björn Gustavsson <[email protected]> | 2015-05-29 10:52:04 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-05-29 10:52:04 +0200 |
| commit | 6635bfa7c480d33d43874f4b37b7c461ba04db23 (patch) | |
| tree | 262a0c6a6cfd507a3e8afb40a29d849d044b09dc /erts/emulator | |
| parent | eca01e7621918cb81535d0243d28adcc8dfbba34 (diff) | |
| parent | 0f5916b35938c983cd5a4a9931730a5e554358f3 (diff) | |
| download | otp-6635bfa7c480d33d43874f4b37b7c461ba04db23.tar.gz otp-6635bfa7c480d33d43874f4b37b7c461ba04db23.tar.bz2 otp-6635bfa7c480d33d43874f4b37b7c461ba04db23.zip | |
Merge branch 'legoscia/dialyzer/cache-hipe-binaries/OTP-12779'
* legoscia/dialyzer/cache-hipe-binaries/OTP-12779:
Dialyzer to cache results of HiPE compilation
Change hipe_bifs:system_crc/1 to hipe_bifs:system_crc/0
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.c | 6 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_bif0.tab | 2 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_mkliterals.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c index 099f4f90de..a4311d22e2 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -1745,13 +1745,11 @@ BIF_RETTYPE hipe_bifs_check_crc_1(BIF_ALIST_1) BIF_RET(am_false); } -BIF_RETTYPE hipe_bifs_system_crc_1(BIF_ALIST_1) +BIF_RETTYPE hipe_bifs_system_crc_0(BIF_ALIST_0) { Uint crc; - if (!term_to_Uint(BIF_ARG_1, &crc)) - BIF_ERROR(BIF_P, BADARG); - crc ^= (HIPE_SYSTEM_CRC ^ HIPE_LITERALS_CRC); + crc = HIPE_SYSTEM_CRC; BIF_RET(Uint_to_term(crc, BIF_P)); } diff --git a/erts/emulator/hipe/hipe_bif0.tab b/erts/emulator/hipe/hipe_bif0.tab index a3e04802df..4271a78de3 100644 --- a/erts/emulator/hipe/hipe_bif0.tab +++ b/erts/emulator/hipe/hipe_bif0.tab @@ -74,7 +74,7 @@ bif hipe_bifs:set_native_address_in_fe/2 bif hipe_bifs:find_na_or_make_stub/2 bif hipe_bifs:check_crc/1 -bif hipe_bifs:system_crc/1 +bif hipe_bifs:system_crc/0 bif hipe_bifs:get_rts_param/1 #bif hipe_bifs:tuple_to_float/1 diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c index ed355ce264..49e8d39360 100644 --- a/erts/emulator/hipe/hipe_mkliterals.c +++ b/erts/emulator/hipe/hipe_mkliterals.c @@ -648,8 +648,7 @@ static int do_e(FILE *fp, const char* this_exe) fprintf(fp, "-define(HIPE_SYSTEM_CRC, %u).\n", system_crc); } else { - fprintf(fp, "-define(HIPE_SYSTEM_CRC, hipe_bifs:system_crc(%u)).\n", - literals_crc); + fprintf(fp, "-define(HIPE_SYSTEM_CRC, hipe_bifs:system_crc()).\n"); } return 0; } |