/hg/release/icedtea6-1.8: Fix hs16 build with new security patches.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 30 18:17:29 PDT 2010
changeset 5131198fdc3e in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=5131198fdc3e
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 31 02:17:13 2010 +0100
Fix hs16 build with new security patches.
2009-03-31 Andrew John Hughes <ahughes at redhat.com>
* patches/security/20100330/6626217.patch,
* patches/security/20100330/hotspot/hs16/6626217.patch,
* patches/security/20100330/hotspot/original/6626217.patch:
Split 6626217 into hs14 and hs16 versions.
* Makefile.am: Use $(HSBUILD) appropriately.
* patches/security/20100330/6894807.patch,
* patches/security/20100330/hotspot/hs16/6894807.patch,
* patches/security/20100330/hotspot/original/6894807.patch:
Move 6894807 patch to top-level; same for both hs14 and hs16.
diffstat:
8 files changed, 381 insertions(+), 324 deletions(-)
ChangeLog | 12
Makefile.am | 4
patches/security/20100330/6626217.patch | 180 --------------
patches/security/20100330/6894807.patch | 27 ++
patches/security/20100330/hotspot/hs16/6626217.patch | 160 ++++++++++++
patches/security/20100330/hotspot/hs16/6894807.patch | 115 --------
patches/security/20100330/hotspot/original/6626217.patch | 180 ++++++++++++++
patches/security/20100330/hotspot/original/6894807.patch | 27 --
diffs (truncated from 753 to 500 lines):
diff -r 6c90850063a6 -r 5131198fdc3e ChangeLog
--- a/ChangeLog Wed Mar 31 02:41:55 2010 +0200
+++ b/ChangeLog Wed Mar 31 02:17:13 2010 +0100
@@ -1,3 +1,15 @@ 2010-03-30 Edward Nevill <ed at camswl.c
+2009-03-31 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20100330/6626217.patch,
+ * patches/security/20100330/hotspot/hs16/6626217.patch,
+ * patches/security/20100330/hotspot/original/6626217.patch:
+ Split 6626217 into hs14 and hs16 versions.
+ * Makefile.am: Use $(HSBUILD) appropriately.
+ * patches/security/20100330/6894807.patch,
+ * patches/security/20100330/hotspot/hs16/6894807.patch,
+ * patches/security/20100330/hotspot/original/6894807.patch:
+ Move 6894807 patch to top-level; same for both hs14 and hs16.
+
2010-03-30 Edward Nevill <ed at camswl.com>
* bytecodeInterpreter.cpp Fix to support fast bytecodes
diff -r 6c90850063a6 -r 5131198fdc3e Makefile.am
--- a/Makefile.am Wed Mar 31 02:41:55 2010 +0200
+++ b/Makefile.am Wed Mar 31 02:17:13 2010 +0100
@@ -301,7 +301,7 @@ ICEDTEA_PATCHES = \
patches/extensions/netx-dist.patch \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
- patches/security/20100330/6626217.patch \
+ patches/security/20100330/hotspot/$(HSBUILD)/6626217.patch \
patches/security/20100330/6633872.patch \
patches/security/20100330/6639665.patch \
patches/security/20100330/6736390.patch \
@@ -311,7 +311,7 @@ ICEDTEA_PATCHES = \
patches/security/20100330/6892265.patch \
patches/security/20100330/6893947.patch \
patches/security/20100330/6893954.patch \
- patches/security/20100330/hotspot/$(HSBUILD)/6894807.patch \
+ patches/security/20100330/6894807.patch \
patches/security/20100330/6898622.patch \
patches/security/20100330/6898739.patch \
patches/security/20100330/6899653.patch \
diff -r 6c90850063a6 -r 5131198fdc3e patches/security/20100330/6626217.patch
--- a/patches/security/20100330/6626217.patch Wed Mar 31 02:41:55 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-# HG changeset patch
-# User acorn
-# Date 1261523209 18000
-# Node ID 209a7a8a8f966dc4d6b45333cf4f3fa6648a6ecb
-# Parent 75e095764f403b7425e30711b00cc038554a1ae9
-6626217: Fixed loader constraint array handling
-Summary: Loader constraints track array elements, not arrays themselves.
-Reviewed-by: dcubed, kevinw
-
-diff --git openjdk.orig/hotspot/src/share/vm/ci/ciEnv.cpp openjdk/hotspot/src/share/vm/ci/ciEnv.cpp
---- openjdk.orig/hotspot/src/share/vm/ci/ciEnv.cpp
-+++ openjdk/hotspot/src/share/vm/ci/ciEnv.cpp
-@@ -348,30 +348,6 @@ ciKlass* ciEnv::get_klass_by_name_impl(c
- if (found_klass != NULL) {
- // Found it. Build a CI handle.
- return get_object(found_klass)->as_klass();
-- }
--
-- // If we fail to find an array klass, look again for its element type.
-- // The element type may be available either locally or via constraints.
-- // In either case, if we can find the element type in the system dictionary,
-- // we must build an array type around it. The CI requires array klasses
-- // to be loaded if their element klasses are loaded, except when memory
-- // is exhausted.
-- if (sym->byte_at(0) == '[' &&
-- (sym->byte_at(1) == '[' || sym->byte_at(1) == 'L')) {
-- // We have an unloaded array.
-- // Build it on the fly if the element class exists.
-- symbolOop elem_sym = oopFactory::new_symbol(sym->as_utf8()+1,
-- sym->utf8_length()-1,
-- KILL_COMPILE_ON_FATAL_(fail_type));
-- // Get element ciKlass recursively.
-- ciKlass* elem_klass =
-- get_klass_by_name_impl(accessing_klass,
-- get_object(elem_sym)->as_symbol(),
-- require_local);
-- if (elem_klass != NULL && elem_klass->is_loaded()) {
-- // Now make an array for it
-- return ciObjArrayKlass::make_impl(elem_klass);
-- }
- }
-
- if (require_local) return NULL;
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.cpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp
-@@ -338,32 +338,6 @@ klassOop LoaderConstraintTable::find_con
- }
-
-
--klassOop LoaderConstraintTable::find_constrained_elem_klass(symbolHandle name,
-- symbolHandle elem_name,
-- Handle loader,
-- TRAPS) {
-- LoaderConstraintEntry *p = *(find_loader_constraint(name, loader));
-- if (p != NULL) {
-- assert(p->klass() == NULL, "Expecting null array klass");
--
-- // The array name has a constraint, but it will not have a class. Check
-- // each loader for an associated elem
-- for (int i = 0; i < p->num_loaders(); i++) {
-- Handle no_protection_domain;
--
-- klassOop k = SystemDictionary::find(elem_name, p->loader(i), no_protection_domain, THREAD);
-- if (k != NULL) {
-- // Return the first elem klass found.
-- return k;
-- }
-- }
-- }
--
-- // No constraints, or else no klass loaded yet.
-- return NULL;
--}
--
--
- void LoaderConstraintTable::ensure_loader_constraint_capacity(
- LoaderConstraintEntry *p,
- int nfree) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.hpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp
---- openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.hpp
-+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp
-@@ -67,9 +67,6 @@ public:
- Handle loader2, bool is_method, TRAPS);
-
- klassOop find_constrained_klass(symbolHandle name, Handle loader);
-- klassOop find_constrained_elem_klass(symbolHandle name, symbolHandle elem_name,
-- Handle loader, TRAPS);
--
-
- // Class loader constraints
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -2113,9 +2113,8 @@ klassOop SystemDictionary::find_constrai
- // a loader constraint that would require this loader to return the
- // klass that is already loaded.
- if (FieldType::is_array(class_name())) {
-- // Array classes are hard because their klassOops are not kept in the
-- // constraint table. The array klass may be constrained, but the elem class
-- // may not be.
-+ // For array classes, their klassOops are not kept in the
-+ // constraint table. The element klassOops are.
- jint dimension;
- symbolOop object_key;
- BasicType t = FieldType::get_array_info(class_name(), &dimension,
-@@ -2125,8 +2124,9 @@ klassOop SystemDictionary::find_constrai
- } else {
- symbolHandle elem_name(THREAD, object_key);
- MutexLocker mu(SystemDictionary_lock, THREAD);
-- klass = constraints()->find_constrained_elem_klass(class_name, elem_name, class_loader, THREAD);
-+ klass = constraints()->find_constrained_klass(elem_name, class_loader);
- }
-+ // If element class already loaded, allocate array klass
- if (klass != NULL) {
- klass = Klass::cast(klass)->array_klass_or_null(dimension);
- }
-@@ -2142,24 +2142,40 @@ klassOop SystemDictionary::find_constrai
-
- bool SystemDictionary::add_loader_constraint(symbolHandle class_name,
- Handle class_loader1,
-- Handle class_loader2,
-- Thread* THREAD) {
-- unsigned int d_hash1 = dictionary()->compute_hash(class_name, class_loader1);
-+ Handle class_loader2,
-+ Thread* THREAD) {
-+ symbolHandle constraint_name;
-+ if (!FieldType::is_array(class_name())) {
-+ constraint_name = class_name;
-+ } else {
-+ // For array classes, their klassOops are not kept in the
-+ // constraint table. The element classes are.
-+ jint dimension;
-+ symbolOop object_key;
-+ BasicType t = FieldType::get_array_info(class_name(), &dimension,
-+ &object_key, CHECK_(false));
-+ // primitive types always pass
-+ if (t != T_OBJECT) {
-+ return true;
-+ } else {
-+ constraint_name = symbolHandle(THREAD, object_key);
-+ }
-+ }
-+ unsigned int d_hash1 = dictionary()->compute_hash(constraint_name, class_loader1);
- int d_index1 = dictionary()->hash_to_index(d_hash1);
-
-- unsigned int d_hash2 = dictionary()->compute_hash(class_name, class_loader2);
-+ unsigned int d_hash2 = dictionary()->compute_hash(constraint_name, class_loader2);
- int d_index2 = dictionary()->hash_to_index(d_hash2);
-+ {
-+ MutexLocker mu_s(SystemDictionary_lock, THREAD);
-
-- {
-- MutexLocker mu_s(SystemDictionary_lock, THREAD);
-+ // Better never do a GC while we're holding these oops
-+ No_Safepoint_Verifier nosafepoint;
-
-- // Better never do a GC while we're holding these oops
-- No_Safepoint_Verifier nosafepoint;
--
-- klassOop klass1 = find_class(d_index1, d_hash1, class_name, class_loader1);
-- klassOop klass2 = find_class(d_index2, d_hash2, class_name, class_loader2);
-- return constraints()->add_entry(class_name, klass1, class_loader1,
-- klass2, class_loader2);
-+ klassOop klass1 = find_class(d_index1, d_hash1, constraint_name, class_loader1);
-+ klassOop klass2 = find_class(d_index2, d_hash2, constraint_name, class_loader2);
-+ return constraints()->add_entry(constraint_name, klass1, class_loader1,
-+ klass2, class_loader2);
- }
- }
-
-@@ -2191,6 +2207,7 @@ symbolOop SystemDictionary::find_resolut
- // Returns the name of the type that failed a loader constraint check, or
- // NULL if no constraint failed. The returned C string needs cleaning up
- // with a ResourceMark in the caller
-+// Arrays are not added to the loader constraint table, their elements are.
- char* SystemDictionary::check_signature_loaders(symbolHandle signature,
- Handle loader1, Handle loader2,
- bool is_method, TRAPS) {
diff -r 6c90850063a6 -r 5131198fdc3e patches/security/20100330/6894807.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20100330/6894807.patch Wed Mar 31 02:17:13 2010 +0100
@@ -0,0 +1,27 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/opto/cfgnode.cpp openjdk/hotspot/src/share/vm/opto/cfgnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/cfgnode.cpp 2009-05-15 00:36:38.000000000 +0100
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp 2010-03-30 21:03:55.000000000 +0100
+@@ -956,6 +956,7 @@
+ }
+ if( jtkp && ttkp ) {
+ if( jtkp->is_loaded() && jtkp->klass()->is_interface() &&
++ !jtkp->klass_is_exact() && // Keep exact interface klass (6894807)
+ ttkp->is_loaded() && !ttkp->klass()->is_interface() ) {
+ assert(ft == ttkp->cast_to_ptr_type(jtkp->ptr()) ||
+ ft->isa_narrowoop() && ft->make_ptr() == ttkp->cast_to_ptr_type(jtkp->ptr()), "");
+diff -Nru openjdk.orig/hotspot/src/share/vm/opto/type.cpp openjdk/hotspot/src/share/vm/opto/type.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/type.cpp 2009-05-15 00:36:38.000000000 +0100
++++ openjdk/hotspot/src/share/vm/opto/type.cpp 2010-03-30 21:02:58.000000000 +0100
+@@ -2501,10 +2501,12 @@
+ ftip->is_loaded() && ftip->klass()->is_interface() &&
+ ktip->is_loaded() && !ktip->klass()->is_interface()) {
+ // Happens in a CTW of rt.jar, 320-341, no extra flags
++ assert(!ftip->klass_is_exact(), "interface could not be exact");
+ return ktip->cast_to_ptr_type(ftip->ptr());
+ }
+ if (ftkp != NULL && ktkp != NULL &&
+ ftkp->is_loaded() && ftkp->klass()->is_interface() &&
++ !ftkp->klass_is_exact() && // Keep exact interface klass
+ ktkp->is_loaded() && !ktkp->klass()->is_interface()) {
+ // Happens in a CTW of rt.jar, 320-341, no extra flags
+ return ktkp->cast_to_ptr_type(ftkp->ptr());
diff -r 6c90850063a6 -r 5131198fdc3e patches/security/20100330/hotspot/hs16/6626217.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20100330/hotspot/hs16/6626217.patch Wed Mar 31 02:17:13 2010 +0100
@@ -0,0 +1,160 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciEnv.cpp openjdk/hotspot/src/share/vm/ci/ciEnv.cpp
+--- openjdk.orig/hotspot/src/share/vm/ci/ciEnv.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/ci/ciEnv.cpp 2010-03-31 00:13:28.000000000 +0100
+@@ -398,30 +398,6 @@
+ return get_object(found_klass)->as_klass();
+ }
+
+- // If we fail to find an array klass, look again for its element type.
+- // The element type may be available either locally or via constraints.
+- // In either case, if we can find the element type in the system dictionary,
+- // we must build an array type around it. The CI requires array klasses
+- // to be loaded if their element klasses are loaded, except when memory
+- // is exhausted.
+- if (sym->byte_at(0) == '[' &&
+- (sym->byte_at(1) == '[' || sym->byte_at(1) == 'L')) {
+- // We have an unloaded array.
+- // Build it on the fly if the element class exists.
+- symbolOop elem_sym = oopFactory::new_symbol(sym->as_utf8()+1,
+- sym->utf8_length()-1,
+- KILL_COMPILE_ON_FATAL_(fail_type));
+- // Get element ciKlass recursively.
+- ciKlass* elem_klass =
+- get_klass_by_name_impl(accessing_klass,
+- get_object(elem_sym)->as_symbol(),
+- require_local);
+- if (elem_klass != NULL && elem_klass->is_loaded()) {
+- // Now make an array for it
+- return ciObjArrayKlass::make_impl(elem_klass);
+- }
+- }
+-
+ if (require_local) return NULL;
+ // Not yet loaded into the VM, or not governed by loader constraints.
+ // Make a CI representative for it.
+diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.cpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp 2010-03-31 00:12:35.000000000 +0100
+@@ -335,32 +335,6 @@
+ }
+
+
+-klassOop LoaderConstraintTable::find_constrained_elem_klass(symbolHandle name,
+- symbolHandle elem_name,
+- Handle loader,
+- TRAPS) {
+- LoaderConstraintEntry *p = *(find_loader_constraint(name, loader));
+- if (p != NULL) {
+- assert(p->klass() == NULL, "Expecting null array klass");
+-
+- // The array name has a constraint, but it will not have a class. Check
+- // each loader for an associated elem
+- for (int i = 0; i < p->num_loaders(); i++) {
+- Handle no_protection_domain;
+-
+- klassOop k = SystemDictionary::find(elem_name, p->loader(i), no_protection_domain, THREAD);
+- if (k != NULL) {
+- // Return the first elem klass found.
+- return k;
+- }
+- }
+- }
+-
+- // No constraints, or else no klass loaded yet.
+- return NULL;
+-}
+-
+-
+ void LoaderConstraintTable::ensure_loader_constraint_capacity(
+ LoaderConstraintEntry *p,
+ int nfree) {
+diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.hpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/loaderConstraints.hpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp 2010-03-31 00:12:35.000000000 +0100
+@@ -66,9 +66,6 @@
+ // bool is_method, TRAPS)
+
+ klassOop find_constrained_klass(symbolHandle name, Handle loader);
+- klassOop find_constrained_elem_klass(symbolHandle name, symbolHandle elem_name,
+- Handle loader, TRAPS);
+-
+
+ // Class loader constraints
+
+diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+--- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp 2009-12-08 23:12:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp 2010-03-31 00:17:35.000000000 +0100
+@@ -2164,9 +2164,8 @@
+ // a loader constraint that would require this loader to return the
+ // klass that is already loaded.
+ if (FieldType::is_array(class_name())) {
+- // Array classes are hard because their klassOops are not kept in the
+- // constraint table. The array klass may be constrained, but the elem class
+- // may not be.
++ // For array classes, their klassOops are not kept in the
++ // constraint table. The element klassOops are.
+ jint dimension;
+ symbolOop object_key;
+ BasicType t = FieldType::get_array_info(class_name(), &dimension,
+@@ -2176,8 +2175,9 @@
+ } else {
+ symbolHandle elem_name(THREAD, object_key);
+ MutexLocker mu(SystemDictionary_lock, THREAD);
+- klass = constraints()->find_constrained_elem_klass(class_name, elem_name, class_loader, THREAD);
++ klass = constraints()->find_constrained_klass(elem_name, class_loader);
+ }
++ // If element class already loaded, allocate array klass
+ if (klass != NULL) {
+ klass = Klass::cast(klass)->array_klass_or_null(dimension);
+ }
+@@ -2195,10 +2195,27 @@
+ Handle class_loader1,
+ Handle class_loader2,
+ Thread* THREAD) {
+- unsigned int d_hash1 = dictionary()->compute_hash(class_name, class_loader1);
++ symbolHandle constraint_name;
++ if (!FieldType::is_array(class_name())) {
++ constraint_name = class_name;
++ } else {
++ // For array classes, their klassOops are not kept in the
++ // constraint table. The element classes are.
++ jint dimension;
++ symbolOop object_key;
++ BasicType t = FieldType::get_array_info(class_name(), &dimension,
++ &object_key, CHECK_(false));
++ // primitive types always pass
++ if (t != T_OBJECT) {
++ return true;
++ } else {
++ constraint_name = symbolHandle(THREAD, object_key);
++ }
++ }
++ unsigned int d_hash1 = dictionary()->compute_hash(constraint_name, class_loader1);
+ int d_index1 = dictionary()->hash_to_index(d_hash1);
+
+- unsigned int d_hash2 = dictionary()->compute_hash(class_name, class_loader2);
++ unsigned int d_hash2 = dictionary()->compute_hash(constraint_name, class_loader2);
+ int d_index2 = dictionary()->hash_to_index(d_hash2);
+
+ {
+@@ -2207,9 +2224,9 @@
+ // Better never do a GC while we're holding these oops
+ No_Safepoint_Verifier nosafepoint;
+
+- klassOop klass1 = find_class(d_index1, d_hash1, class_name, class_loader1);
+- klassOop klass2 = find_class(d_index2, d_hash2, class_name, class_loader2);
+- return constraints()->add_entry(class_name, klass1, class_loader1,
++ klassOop klass1 = find_class(d_index1, d_hash1, constraint_name, class_loader1);
++ klassOop klass2 = find_class(d_index2, d_hash2, constraint_name, class_loader2);
++ return constraints()->add_entry(constraint_name, klass1, class_loader1,
+ klass2, class_loader2);
+ }
+ }
+@@ -2287,6 +2304,7 @@
+ // Returns the name of the type that failed a loader constraint check, or
+ // NULL if no constraint failed. The returned C string needs cleaning up
+ // with a ResourceMark in the caller. No exception except OOME is thrown.
++// Arrays are not added to the loader constraint table, their elements are.
+ char* SystemDictionary::check_signature_loaders(symbolHandle signature,
+ Handle loader1, Handle loader2,
+ bool is_method, TRAPS) {
diff -r 6c90850063a6 -r 5131198fdc3e patches/security/20100330/hotspot/hs16/6894807.patch
--- a/patches/security/20100330/hotspot/hs16/6894807.patch Wed Mar 31 02:41:55 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-# HG changeset patch
-# User kvn
-# Date 1265943511 28800
-# Node ID 9d4986fcac2a07806ffed8a33184da149f76719b
-# Parent 209a7a8a8f966dc4d6b45333cf4f3fa6648a6ecb
-6894807: No ClassCastException for HashAttributeSet constructors if run with -Xcomp
-Summary: Return interface klass type if it is exact.
-Reviewed-by: never
-
-diff --git openjdk.orig/hotspot/src/share/vm/opto/cfgnode.cpp openjdk/hotspot/src/share/vm/opto/cfgnode.cpp
---- openjdk.orig/hotspot/src/share/vm/opto/cfgnode.cpp
-+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp
-@@ -797,9 +797,16 @@ const Type *PhiNode::Value( PhaseTransfo
- // lattice, we must tread carefully around phis which implicitly
- // convert the one to the other.
- const TypeInstPtr* ttip = _type->isa_instptr();
-+ const TypeKlassPtr* ttkp = _type->isa_klassptr();
-+
- bool is_intf = false;
- if (ttip != NULL) {
- ciKlass* k = ttip->klass();
-+ if (k->is_loaded() && k->is_interface())
-+ is_intf = true;
-+ }
-+ if (ttkp != NULL) {
-+ ciKlass* k = ttkp->klass();
- if (k->is_loaded() && k->is_interface())
- is_intf = true;
- }
-@@ -859,6 +866,8 @@ const Type *PhiNode::Value( PhaseTransfo
- // uplift the type.
- if( !t->empty() && ttip && ttip->is_loaded() && ttip->klass()->is_interface() )
- { assert(ft == _type, ""); } // Uplift to interface
-+ else if( !t->empty() && ttkp && ttkp->is_loaded() && ttkp->klass()->is_interface() )
-+ { assert(ft == _type, ""); } // Uplift to interface
- // Otherwise it's something stupid like non-overlapping int ranges
- // found on dying counted loops.
- else
-@@ -873,12 +882,23 @@ const Type *PhiNode::Value( PhaseTransfo
- // join report an interface back out. This isn't possible but happens
- // because the type system doesn't interact well with interfaces.
- const TypeInstPtr *jtip = jt->isa_instptr();
-+ const TypeKlassPtr *jtkp = jt->isa_klassptr();
-+
- if( jtip && ttip ) {
- if( jtip->is_loaded() && jtip->klass()->is_interface() &&
- ttip->is_loaded() && !ttip->klass()->is_interface() )
- // Happens in a CTW of rt.jar, 320-341, no extra flags
- { assert(ft == ttip->cast_to_ptr_type(jtip->ptr()), ""); jt = ft; }
- }
-+ if( jtkp && ttkp ) {
-+ if( jtkp->is_loaded() && jtkp->klass()->is_interface() &&
-+ !jtkp->klass_is_exact() && // Keep exact interface klass (6894807)
-+ ttkp->is_loaded() && !ttkp->klass()->is_interface() ) {
-+ assert(ft == ttkp->cast_to_ptr_type(jtkp->ptr()), "");
-+ jt = ft;
-+ }
-+ }
-+
- if (jt != ft && jt->base() == ft->base()) {
- if (jt->isa_int() &&
- jt->is_int()->_lo == ft->is_int()->_lo &&
-diff --git openjdk.orig/hotspot/src/share/vm/opto/type.cpp openjdk/hotspot/src/share/vm/opto/type.cpp
---- openjdk.orig/hotspot/src/share/vm/opto/type.cpp
-+++ openjdk/hotspot/src/share/vm/opto/type.cpp
-@@ -2357,6 +2357,8 @@ const Type *TypeOopPtr::filter( const Ty
- const Type* ft = join(kills);
- const TypeInstPtr* ftip = ft->isa_instptr();
- const TypeInstPtr* ktip = kills->isa_instptr();
-+ const TypeKlassPtr* ftkp = ft->isa_klassptr();
-+ const TypeKlassPtr* ktkp = kills->isa_klassptr();
-
- if (ft->empty()) {
- // Check for evil case of 'this' being a class and 'kills' expecting an
-@@ -2369,6 +2371,8 @@ const Type *TypeOopPtr::filter( const Ty
- // into a Phi which "knows" it's an Interface type we'll have to
- // uplift the type.
More information about the distro-pkg-dev
mailing list