diff options
| author | Henrik Nord <[email protected]> | 2011-09-08 16:33:33 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-08 16:33:36 +0200 |
| commit | 262a9af33d3ceb4cb032c434b100cea7d4b0d60e (patch) | |
| tree | d89ffaced24cff1ec895a101f999a3ae1cfd79c6 | |
| parent | 2ee4aed839aa63243e2c12694822cfdef7c4ea60 (diff) | |
| parent | 03d8c2877342d5ed57596330a61ec0374092f136 (diff) | |
| download | otp-262a9af33d3ceb4cb032c434b100cea7d4b0d60e.tar.gz otp-262a9af33d3ceb4cb032c434b100cea7d4b0d60e.tar.bz2 otp-262a9af33d3ceb4cb032c434b100cea7d4b0d60e.zip | |
Merge branch 'fm/enif_compare-64-to-32bits-cast' into dev
* fm/enif_compare-64-to-32bits-cast:
Fix enif_compare on 64bits machines
OTP-9533
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 10 | ||||
| -rw-r--r-- | erts/emulator/test/nif_SUITE.erl | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index d9b1a8e89d..6e7ac43676 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -578,7 +578,15 @@ int enif_is_identical(Eterm lhs, Eterm rhs) int enif_compare(Eterm lhs, Eterm rhs) { - return CMP(lhs,rhs); + Sint result = CMP(lhs,rhs); + + if (result < 0) { + return -1; + } else if (result > 0) { + return 1; + } + + return result; } int enif_get_tuple(ErlNifEnv* env, Eterm tpl, int* arity, const Eterm** array) diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index 2867e8e2e4..f6344791f1 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -281,6 +281,12 @@ types(Config) when is_list(Config) -> end, int_list()), ?line verify_tmpmem(TmpMem), + ?line true = (compare(-1294536544000, -1178704800000) < 0), + ?line true = (compare(-1178704800000, -1294536544000) > 0), + ?line true = (compare(-295147905179352825856, -36893488147419103232) < 0), + ?line true = (compare(-36893488147419103232, -295147905179352825856) > 0), + ?line true = (compare(-29514790517935282585612345678, -36893488147419103232) < 0), + ?line true = (compare(-36893488147419103232, -29514790517935282585612345678) > 0), ok. int_list() -> |