From 8aa2bed44b2390a5088469d451b41ed21aaf872a Mon Sep 17 00:00:00 2001 From: Ivan Dubrov Date: Thu, 1 May 2014 10:23:39 -0700 Subject: Do not re-initialize secondary entries --- hotspot/.hg/patches/light-jdk7u51-b13.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'hotspot/.hg') 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()); ++ } } } -- cgit v1.2.3