diff options
| author | skybber <lada.dvorak7@gmail.com> | 2018-11-04 19:40:15 +0100 |
|---|---|---|
| committer | skybber <lada.dvorak7@gmail.com> | 2018-11-04 19:40:15 +0100 |
| commit | 3cda1cbda58497e7336dfadc656767f5af6dc6e9 (patch) | |
| tree | a72a5a00a7572d995b9399135571872de005e8ec | |
| parent | 6d520d8402ecd33d98da8ba6d044eecd734c9ceb (diff) | |
| download | dcevm-3cda1cbda58497e7336dfadc656767f5af6dc6e9.tar.gz dcevm-3cda1cbda58497e7336dfadc656767f5af6dc6e9.zip | |
Add set_method_ids stuff unintentionally removed
removed in 8u152 patch
| -rw-r--r-- | hotspot/.hg/patches/orig-meth-ids-revert-jdk8u152.patch | 28 | ||||
| -rw-r--r-- | hotspot/.hg/patches/series | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/hotspot/.hg/patches/orig-meth-ids-revert-jdk8u152.patch b/hotspot/.hg/patches/orig-meth-ids-revert-jdk8u152.patch new file mode 100644 index 00000000..fda92d02 --- /dev/null +++ b/hotspot/.hg/patches/orig-meth-ids-revert-jdk8u152.patch @@ -0,0 +1,28 @@ +diff --git a/src/share/vm/prims/jvmtiRedefineClasses2.cpp b/src/share/vm/prims/jvmtiRedefineClasses2.cpp +index d35406d..b41dfe9 100644 +--- a/src/share/vm/prims/jvmtiRedefineClasses2.cpp ++++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp +@@ -784,8 +784,10 @@ + if (idnum_owner != NULL) { + // There is already a method assigned this idnum -- switch them + idnum_owner->set_method_idnum(new_num); ++ idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum()); + } + k_new_method->set_method_idnum(old_num); ++ k_new_method->set_orig_method_idnum(k_old_method->orig_method_idnum()); + RC_TRACE(0x00008000, + ("swapping idnum of new and old method %d / %d!", new_num, old_num)); + } +@@ -816,9 +818,12 @@ + Method* idnum_owner = new_class->method_with_idnum(num); + if (idnum_owner != NULL) { + // There is already a method assigned this idnum -- switch them ++ // Take current and original idnum from the new_method + idnum_owner->set_method_idnum(new_num); ++ idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum()); + } + k_new_method->set_method_idnum(num); ++ k_new_method->set_orig_method_idnum(num); + } + RC_TRACE(0x00008000, ("Method added: new: %s [%d], idnum %d", + k_new_method->name_and_sig_as_C_string(), ni, k_new_method->method_idnum())); diff --git a/hotspot/.hg/patches/series b/hotspot/.hg/patches/series index 28c682c0..ea54f85b 100644 --- a/hotspot/.hg/patches/series +++ b/hotspot/.hg/patches/series @@ -59,3 +59,4 @@ light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 #+light-jdk 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-jdk8u172-b11 #+light-jdk8u181-b13 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-jdk8u172-b11 #+light-jdk8u181-b13 light-updateClassRedefinedCount-java8.patch #+light-jdk8u112-b16 #+light-jdk8u144-b01 #+light-jdk8u152-b16 #+light-jdk8u172-b11 #+light-jdk8u181-b13 +orig-meth-ids-revert-jdk8u152.patch #+light-jdk8u152-b16 #+light-jdk8u172-b11 #+light-jdk8u181-b13 |