aboutsummaryrefslogtreecommitdiffstats
path: root/hotspot/.hg
diff options
context:
space:
mode:
authorIvan Dubrov <idubrov@guidewire.com>2014-05-01 10:23:39 -0700
committerIvan Dubrov <idubrov@guidewire.com>2014-05-01 10:23:39 -0700
commit8aa2bed44b2390a5088469d451b41ed21aaf872a (patch)
tree72437773f15b671ca1f4784a8f4b67120c7bfa39 /hotspot/.hg
parent18aa9885955abe6ad40210c48360e8b6e48a8471 (diff)
downloaddcevm-8aa2bed44b2390a5088469d451b41ed21aaf872a.tar.gz
dcevm-8aa2bed44b2390a5088469d451b41ed21aaf872a.zip
Do not re-initialize secondary entries
Diffstat (limited to 'hotspot/.hg')
-rw-r--r--hotspot/.hg/patches/light-jdk7u51-b13.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/hotspot/.hg/patches/light-jdk7u51-b13.patch b/hotspot/.hg/patches/light-jdk7u51-b13.patch
index 05cf5244..bdab9662 100644
--- a/hotspot/.hg/patches/light-jdk7u51-b13.patch
+++ b/hotspot/.hg/patches/light-jdk7u51-b13.patch
@@ -2063,7 +2063,7 @@ diff --git a/src/share/vm/oops/cpCacheOop.cpp b/src/share/vm/oops/cpCacheOop.cpp
void ConstantPoolCacheEntry::print(outputStream* st, int index) const {
// print separator
if (index == 0) st->print_cr(" -------------");
-@@ -663,60 +559,10 @@
+@@ -663,60 +559,12 @@
}
}
@@ -2104,7 +2104,9 @@ diff --git a/src/share/vm/oops/cpCacheOop.cpp b/src/share/vm/oops/cpCacheOop.cpp
- break;
- }
- }
-+ entry_at(i)->initialize_entry(entry_at(i)->constant_pool_index());
++ if (!entry_at(i)->is_secondary_entry()) {
++ entry_at(i)->initialize_entry(entry_at(i)->constant_pool_index());
++ }
}
}