diff options
| author | Przemysław Rumik <przemelek@gmail.com> | 2018-05-26 13:02:16 +0200 |
|---|---|---|
| committer | Przemysław Rumik <przemelek@gmail.com> | 2018-05-26 13:02:16 +0200 |
| commit | d5228b374a5d2218785095cd175de8e212fe810f (patch) | |
| tree | 3bfbe62d682ace9c6b0eaad979c5c36267c2f290 /hotspot | |
| parent | 73e2f0eef882b146ecc561bf997b2d9ead0a113a (diff) | |
| parent | 6f627e7c78800caab7f67ff51e45e02de9595d01 (diff) | |
| download | dcevm-d5228b374a5d2218785095cd175de8e212fe810f.tar.gz dcevm-d5228b374a5d2218785095cd175de8e212fe810f.zip | |
updated to dcevm/dcevm
Diffstat (limited to 'hotspot')
| -rw-r--r-- | hotspot/.hg/patches/light-updateClassRedefinedCount-java8.patch | 28 | ||||
| -rw-r--r-- | hotspot/.hg/patches/series | 5 |
2 files changed, 31 insertions, 2 deletions
diff --git a/hotspot/.hg/patches/light-updateClassRedefinedCount-java8.patch b/hotspot/.hg/patches/light-updateClassRedefinedCount-java8.patch new file mode 100644 index 00000000..31ca8952 --- /dev/null +++ b/hotspot/.hg/patches/light-updateClassRedefinedCount-java8.patch @@ -0,0 +1,28 @@ +diff -r 7bb5278e8ce7 src/share/vm/prims/jvmtiRedefineClasses2.cpp +--- a/src/share/vm/prims/jvmtiRedefineClasses2.cpp Fri Mar 23 15:32:54 2018 +0100 ++++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp Sat Mar 24 15:49:52 2018 +0100 +@@ -1763,8 +1763,8 @@ + + // increment the classRedefinedCount field in the_class and in any + // direct and indirect subclasses of the_class +- increment_class_counter((InstanceKlass *)the_old_class(), THREAD); +- ++ increment_class_counter((InstanceKlass *)the_new_class(), THREAD); ++ + } + + +@@ -1864,10 +1864,10 @@ + + // Increment the classRedefinedCount field in the specific InstanceKlass + // and in all direct and indirect subclasses. +-void VM_EnhancedRedefineClasses::increment_class_counter(Klass* klass, TRAPS) { +- oop class_mirror = klass->java_mirror(); ++void VM_EnhancedRedefineClasses::increment_class_counter(Klass* klass, TRAPS) { ++ oop class_mirror = klass->old_version()->java_mirror(); + int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1; +- java_lang_Class::set_classRedefinedCount(class_mirror, new_count); ++ java_lang_Class::set_classRedefinedCount(klass->java_mirror(), new_count); + RC_TRACE(0x00000008, ("updated count for class=%s to %d", klass->external_name(), new_count)); + } + diff --git a/hotspot/.hg/patches/series b/hotspot/.hg/patches/series index ef3bea27..6d6d06eb 100644 --- a/hotspot/.hg/patches/series +++ b/hotspot/.hg/patches/series @@ -54,5 +54,6 @@ light-jdk8u152-b16.patch #+light-jdk8u152-b16 #+light-jdk8u161-b12 #+light-jdk8u jvmti-getLoadedClasses-java8.patch #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 #+light-jdk8u161-b12 #+light-jdk8u162-b12 jvmti-lockRedefine-java8.patch #+light-jdk8u144-b01delete light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 #+light-jdk8u40-b25 #+light-jdk8u45-b14 #+light-jdk8u51-b16 -light-jdk8u66-b17-deopt-cp.patch #+light-jdk8u66-b17 #+light-jdk8u74-b02 #+light-jdk8u92-b14 #+light-jdk8u102-b31 #+light-jdk8u111-b14 #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 #+light-jdk8u161-b12 #+light-jdk8u162-b12 -dont-clear-f1.patch #+light-jdk8u74-b02 #+light-jdk8u92-b14 #+light-jdk8u102-b31 #+light-jdk8u111-b14 #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 #+light-jdk8u161-b12 #+light-jdk8u162-b12 +light-jdk8u66-b17-deopt-cp.patch #+light-jdk8u66-b17 #+light-jdk8u74-b02 #+light-jdk8u92-b14 #+light-jdk8u102-b31 #+light-jdk8u111-b14 #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 +dont-clear-f1.patch #+light-jdk8u74-b02 #+light-jdk8u92-b14 #+light-jdk8u102-b31 #+light-jdk8u111-b14 #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 +light-updateClassRedefinedCount-java8.patch #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 |