stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6798785: Crash in OopFlow::build_oop_map: incorrect comparison of 64bit pointers

Browse Source 
Reviewed-by: phh, kvn
This commit is contained in:
Tom Rodriguez 2009-02-04 11:44:57 -08:00
parent c46f747070
commit a70da64c72
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hotspot/src/share/vm/adlc/dict2.cpp
View File

@ -316,9 +316,12 @@ int cmpstr(const void *k1, const void *k2) {
return strcmp((const char *)k1,(const char *)k2); return strcmp((const char *)k1,(const char *)k2);
} }
// Slimey cheap key comparator. // Cheap key comparator.
int cmpkey(const void *key1, const void *key2) { int cmpkey(const void *key1, const void *key2) {
return (int)((intptr_t)key1 - (intptr_t)key2); if (key1 == key2) return 0;
intptr_t delta = (intptr_t)key1 - (intptr_t)key2;
if (delta > 0) return 1;
return -1;
} }
//============================================================================= //=============================================================================

7
hotspot/src/share/vm/libadt/dict.cpp
View File

@ -346,9 +346,12 @@ int32 cmpstr(const void *k1, const void *k2) {
return strcmp((const char *)k1,(const char *)k2); return strcmp((const char *)k1,(const char *)k2);
} }
// Slimey cheap key comparator. // Cheap key comparator.
int32 cmpkey(const void *key1, const void *key2) { int32 cmpkey(const void *key1, const void *key2) {
return (int32)((intptr_t)key1 - (intptr_t)key2); if (key1 == key2) return 0;
intptr_t delta = (intptr_t)key1 - (intptr_t)key2;
if (delta > 0) return 1;
return -1;
} }
//============================================================================= //=============================================================================