blob: b9e059f4a30c59ebce892b48db975fe357b9e9c5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
Index: icedtea-2.3.3/patches/hotspot/zero/6924259-string_offset.patch
===================================================================
--- icedtea-2.3.3.orig/patches/hotspot/zero/6924259-string_offset.patch 2012-10-17 10:20:09.779948816 +0200
+++ icedtea-2.3.3/patches/hotspot/zero/6924259-string_offset.patch 2012-10-19 14:56:22.265958143 +0200
@@ -378,7 +378,7 @@
diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp
--- openjdk/hotspot/src/share/vm/memory/dump.cpp
+++ openjdk/hotspot/src/share/vm/memory/dump.cpp
-@@ -78,8 +78,8 @@
+@@ -78,8 +78,8 @@ public:
void do_oop(oop* p) {
if (p != NULL) {
oop obj = *p;
@@ -386,7 +386,7 @@
-
+ if (obj->klass() == SystemDictionary::String_klass() &&
+ java_lang_String::has_hash_field()) {
- int hash = java_lang_String::hash_string(obj);
+ int hash = java_lang_String::to_hash(obj);
obj->int_field_put(hash_offset, hash);
}
diff --git a/src/share/vm/opto/graphKit.cpp b/src/share/vm/opto/graphKit.cpp
|
