[openjdk-8-jre-dcevm] 04/08: New upstream release
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Oct 18 15:42:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjdk-8-jre-dcevm.
commit 2f08143cfa13c79e042dc62e83c232e59cd5cfbf
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Sep 20 19:06:47 2016 +0200
New upstream release
---
debian/changelog | 3 +-
debian/orig-tar.sh | 2 +-
debian/patches/dont-clear-f1.patch | 57 ++++
...t-jdk8u66-b17.patch => light-jdk8u92-b14.patch} | 330 ++++++++++++---------
debian/patches/series | 3 +-
5 files changed, 249 insertions(+), 146 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bbb579e..06e899d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-openjdk-8-jre-dcevm (8u74-2) UNRELEASED; urgency=medium
+openjdk-8-jre-dcevm (8u92-1) UNRELEASED; urgency=medium
+ * New upstream release
* Standards-Version updated to 3.9.8
* Use a secure Vcs-Git URL
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 49688cd..482851d 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,7 +3,7 @@
PACKAGE=$(dpkg-parsechangelog -S Source)
VERSION=$2
TAR=../${PACKAGE}_${VERSION}.orig.tar.gz
-TAG=jdk8u74-b02
+TAG=jdk8u92-b14
rm -f $3
diff --git a/debian/patches/dont-clear-f1.patch b/debian/patches/dont-clear-f1.patch
new file mode 100644
index 0000000..0f486e5
--- /dev/null
+++ b/debian/patches/dont-clear-f1.patch
@@ -0,0 +1,57 @@
+# HG changeset patch
+# Parent 89c7125da633a3b47b117c4c7ccbc60b6daa7581
+
+diff -r 89c7125da633 src/share/vm/oops/cpCache.cpp
+--- a/src/share/vm/oops/cpCache.cpp Wed Apr 06 12:04:17 2016 -0700
++++ b/src/share/vm/oops/cpCache.cpp Wed Apr 06 20:11:06 2016 -0700
+@@ -536,17 +536,22 @@
+ // Enhanced RedefineClasses() API support (DCEVM):
+ // Clear cached entry, let it be re-resolved
+ void ConstantPoolCacheEntry::clear_entry() {
++ // Always clear for invokehandle/invokedynamic to re-resolve them
++ bool clearData = bytecode_1() == Bytecodes::_invokehandle || bytecode_1() == Bytecodes::_invokedynamic;
+ _indices = constant_pool_index();
+- _f1 = NULL;
+- if (!is_resolved_reference()) {
+- _f2 = 0;
++
++ if (clearData) {
++ if (!is_resolved_reference()) {
++ _f2 = 0;
++ }
++ // FIXME: (DCEVM) we want to clear flags, but parameter size is actually used
++ // after we return from the method, before entry is re-initialized. So let's
++ // keep parameter size the same.
++ // For example, it's used in TemplateInterpreterGenerator::generate_return_entry_for
++ // Also, we need to keep flag marking entry as one containing resolved_reference
++ _flags &= parameter_size_mask | (1 << is_resolved_ref_shift);
++ _f1 = NULL;
+ }
+- // FIXME: (DCEVM) we want to clear flags, but parameter size is actually used
+- // after we return from the method, before entry is re-initialized. So let's
+- // keep parameter size the same.
+- // For example, it's used in TemplateInterpreterGenerator::generate_return_entry_for
+- // Also, we need to keep flag marking entry as one containing resolved_reference
+- _flags &= parameter_size_mask | (1 << is_resolved_ref_shift);
+ }
+ #endif // INCLUDE_JVMTI
+
+diff -r 89c7125da633 src/share/vm/oops/cpCache.hpp
+--- a/src/share/vm/oops/cpCache.hpp Wed Apr 06 12:04:17 2016 -0700
++++ b/src/share/vm/oops/cpCache.hpp Wed Apr 06 20:11:06 2016 -0700
+@@ -141,13 +141,13 @@
+ void set_bytecode_2(Bytecodes::Code code);
+ void set_f1(Metadata* f1) {
+ Metadata* existing_f1 = (Metadata*)_f1; // read once
+- assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
++ //assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
+ _f1 = f1;
+ }
+ void release_set_f1(Metadata* f1);
+ void set_f2(intx f2) {
+ intx existing_f2 = _f2; // read once
+- assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");
++ //assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");
+ _f2 = f2;
+ }
+ void set_f2_as_vfinal_method(Method* f2) {
diff --git a/debian/patches/light-jdk8u66-b17.patch b/debian/patches/light-jdk8u92-b14.patch
similarity index 93%
rename from debian/patches/light-jdk8u66-b17.patch
rename to debian/patches/light-jdk8u92-b14.patch
index 0c2aefd..9b02593 100644
--- a/debian/patches/light-jdk8u66-b17.patch
+++ b/debian/patches/light-jdk8u92-b14.patch
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent e9de8692675d6e6afad32f4268694ea41b99a6ce
+# Parent 79f7af7e889153559770404b64f0829f7a9dbaab
-diff -r e9de8692675d src/share/vm/ci/ciObjectFactory.cpp
---- a/src/share/vm/ci/ciObjectFactory.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/ci/ciObjectFactory.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/ci/ciObjectFactory.cpp
+--- a/src/share/vm/ci/ciObjectFactory.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/ci/ciObjectFactory.cpp Fri May 20 09:41:04 2016 -0700
@@ -799,3 +799,27 @@
_unloaded_instances->length(),
_unloaded_klasses->length());
@@ -32,9 +32,9 @@ diff -r e9de8692675d src/share/vm/ci/ciObjectFactory.cpp
+#endif // ASSERT
+}
+
-diff -r e9de8692675d src/share/vm/ci/ciObjectFactory.hpp
---- a/src/share/vm/ci/ciObjectFactory.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/ci/ciObjectFactory.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/ci/ciObjectFactory.hpp
+--- a/src/share/vm/ci/ciObjectFactory.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/ci/ciObjectFactory.hpp Fri May 20 09:41:04 2016 -0700
@@ -92,6 +92,7 @@
ciInstance* get_unloaded_instance(ciInstanceKlass* klass);
@@ -52,9 +52,9 @@ diff -r e9de8692675d src/share/vm/ci/ciObjectFactory.hpp
};
#endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP
-diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
---- a/src/share/vm/classfile/classFileParser.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/classFileParser.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/classFileParser.cpp
+--- a/src/share/vm/classfile/classFileParser.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/classFileParser.cpp Fri May 20 09:41:04 2016 -0700
@@ -763,6 +763,7 @@
Array<Klass*>* ClassFileParser::parse_interfaces(int length,
Handle protection_domain,
@@ -86,7 +86,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
interf = KlassHandle(THREAD, k);
}
-@@ -3137,6 +3145,7 @@
+@@ -3135,6 +3143,7 @@
}
instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index,
@@ -94,7 +94,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
TRAPS) {
instanceKlassHandle super_klass;
if (super_class_index == 0) {
-@@ -3153,7 +3162,11 @@
+@@ -3151,7 +3160,11 @@
// However, make sure it is not an array type.
bool is_array = false;
if (_cp->tag_at(super_class_index).is_klass()) {
@@ -107,7 +107,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
if (_need_verify)
is_array = super_klass->oop_is_array();
} else if (_need_verify) {
-@@ -3702,8 +3715,10 @@
+@@ -3700,8 +3713,10 @@
instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
ClassLoaderData* loader_data,
Handle protection_domain,
@@ -118,7 +118,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
TempNewSymbol& parsed_name,
bool verify,
TRAPS) {
-@@ -3717,6 +3732,7 @@
+@@ -3715,6 +3730,7 @@
Handle class_loader(THREAD, loader_data->class_loader());
bool has_default_methods = false;
bool declares_default_methods = false;
@@ -126,7 +126,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
ResourceMark rm(THREAD);
ClassFileStream* cfs = stream();
-@@ -3733,7 +3749,7 @@
+@@ -3731,7 +3747,7 @@
init_parsed_class_attributes(loader_data);
@@ -135,7 +135,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
// Get the cached class file bytes (if any) from the class that
// is being redefined or retransformed. We use jvmti_thread_state()
// instead of JvmtiThreadState::state_for(jt) so we don't allocate
-@@ -3894,6 +3910,26 @@
+@@ -3892,6 +3908,26 @@
CHECK_(nullHandle));
}
@@ -162,7 +162,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
Klass* preserve_this_klass; // for storing result across HandleMark
// release all handles when parsing is done
-@@ -3932,13 +3968,14 @@
+@@ -3930,13 +3966,14 @@
u2 super_class_index = cfs->get_u2_fast();
instanceKlassHandle super_klass = parse_super_class(super_class_index,
@@ -178,7 +178,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
u2 java_fields_count = 0;
// Fields (offsets are filled in later)
-@@ -3987,6 +4024,9 @@
+@@ -3985,6 +4022,9 @@
true,
CHECK_(nullHandle));
@@ -188,7 +188,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
KlassHandle kh (THREAD, k);
super_klass = instanceKlassHandle(THREAD, kh());
}
-@@ -4152,7 +4192,7 @@
+@@ -4150,7 +4190,7 @@
fill_oop_maps(this_klass, info.nonstatic_oop_map_count, info.nonstatic_oop_offsets, info.nonstatic_oop_counts);
// Fill in has_finalizer, has_vanilla_constructor, and layout_helper
@@ -197,7 +197,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
// reinitialize modifiers, using the InnerClasses attribute
int computed_modifiers = this_klass->compute_modifier_flags(CHECK_(nullHandle));
-@@ -4404,7 +4444,7 @@
+@@ -4402,7 +4442,7 @@
}
@@ -206,7 +206,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
Klass* super = k->super();
// Check if this klass has an empty finalize method (i.e. one with return bytecode only),
-@@ -4412,7 +4452,9 @@
+@@ -4410,7 +4450,9 @@
if (!_has_empty_finalizer) {
if (_has_finalizer ||
(super != NULL && super->has_finalizer())) {
@@ -217,7 +217,7 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
}
}
-@@ -4434,7 +4476,7 @@
+@@ -4432,7 +4474,7 @@
// Check if this klass supports the java.lang.Cloneable interface
if (SystemDictionary::Cloneable_klass_loaded()) {
@@ -226,9 +226,9 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.cpp
k->set_is_cloneable();
}
}
-diff -r e9de8692675d src/share/vm/classfile/classFileParser.hpp
---- a/src/share/vm/classfile/classFileParser.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/classFileParser.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/classFileParser.hpp
+--- a/src/share/vm/classfile/classFileParser.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/classFileParser.hpp Fri May 20 09:41:04 2016 -0700
@@ -219,11 +219,12 @@
Array<Klass*>* parse_interfaces(int length,
Handle protection_domain,
@@ -274,9 +274,9 @@ diff -r e9de8692675d src/share/vm/classfile/classFileParser.hpp
TempNewSymbol& parsed_name,
bool verify,
TRAPS);
-diff -r e9de8692675d src/share/vm/classfile/classLoader.cpp
---- a/src/share/vm/classfile/classLoader.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/classLoader.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/classLoader.cpp
+--- a/src/share/vm/classfile/classLoader.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/classLoader.cpp Fri May 20 09:41:04 2016 -0700
@@ -1124,6 +1124,7 @@
instanceKlassHandle result = parser.parseClassFile(h_name,
loader_data,
@@ -285,9 +285,9 @@ diff -r e9de8692675d src/share/vm/classfile/classLoader.cpp
parsed_name,
context.should_verify(classpath_index),
THREAD);
-diff -r e9de8692675d src/share/vm/classfile/dictionary.cpp
---- a/src/share/vm/classfile/dictionary.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/dictionary.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/dictionary.cpp
+--- a/src/share/vm/classfile/dictionary.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/dictionary.cpp Fri May 20 09:41:04 2016 -0700
@@ -145,7 +145,7 @@
InstanceKlass* ik = InstanceKlass::cast(e);
@@ -357,9 +357,9 @@ diff -r e9de8692675d src/share/vm/classfile/dictionary.cpp
}
-diff -r e9de8692675d src/share/vm/classfile/dictionary.hpp
---- a/src/share/vm/classfile/dictionary.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/dictionary.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/dictionary.hpp
+--- a/src/share/vm/classfile/dictionary.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/dictionary.hpp Fri May 20 09:41:04 2016 -0700
@@ -78,6 +78,10 @@
void add_klass(Symbol* class_name, ClassLoaderData* loader_data,KlassHandle obj);
@@ -383,9 +383,9 @@ diff -r e9de8692675d src/share/vm/classfile/dictionary.hpp
// Unload (that is, break root links to) all unmarked classes and loaders.
void do_unloading();
-diff -r e9de8692675d src/share/vm/classfile/javaClasses.cpp
---- a/src/share/vm/classfile/javaClasses.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/javaClasses.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/javaClasses.cpp
+--- a/src/share/vm/classfile/javaClasses.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/javaClasses.cpp Fri May 20 09:41:04 2016 -0700
@@ -1712,6 +1712,8 @@
skip_throwableInit_check = true;
}
@@ -395,10 +395,30 @@ diff -r e9de8692675d src/share/vm/classfile/javaClasses.cpp
if (method->is_hidden()) {
if (skip_hidden) continue;
}
-diff -r e9de8692675d src/share/vm/classfile/loaderConstraints.cpp
---- a/src/share/vm/classfile/loaderConstraints.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/loaderConstraints.cpp Mon Dec 07 17:08:11 2015 -0800
-@@ -446,7 +446,7 @@
+diff -r 79f7af7e8891 src/share/vm/classfile/loaderConstraints.cpp
+--- a/src/share/vm/classfile/loaderConstraints.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/loaderConstraints.cpp Fri May 20 09:41:04 2016 -0700
+@@ -98,6 +98,19 @@
+ return pp;
+ }
+
++void LoaderConstraintTable::update_after_redefinition() {
++ for (int index = 0; index < table_size(); index++) {
++ LoaderConstraintEntry** p = bucket_addr(index);
++ while(*p) {
++ LoaderConstraintEntry* probe = *p;
++ if (probe->klass() != NULL) {
++ // We swap the class with the newest version with an assumption that the hash will be the same
++ probe->set_klass(probe->klass()->newest_version());
++ }
++ p = probe->next_addr();
++ }
++ }
++}
+
+ void LoaderConstraintTable::purge_loader_constraints() {
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
+@@ -446,7 +459,7 @@
if (k != NULL) {
// We found the class in the system dictionary, so we should
// make sure that the Klass* matches what we already have.
@@ -407,9 +427,22 @@ diff -r e9de8692675d src/share/vm/classfile/loaderConstraints.cpp
} else {
// If we don't find the class in the system dictionary, it
// has to be in the placeholders table.
-diff -r e9de8692675d src/share/vm/classfile/systemDictionary.cpp
---- a/src/share/vm/classfile/systemDictionary.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/systemDictionary.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/loaderConstraints.hpp
+--- a/src/share/vm/classfile/loaderConstraints.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/loaderConstraints.hpp Fri May 20 09:41:04 2016 -0700
+@@ -64,6 +64,9 @@
+ // Enhanced Class Redefinition support
+ void classes_do(KlassClosure* f);
+
++ // (DCEVM) update all klasses with newest version
++ void update_after_redefinition();
++
+ // Check class loader constraints
+ bool add_entry(Symbol* name, Klass* klass1, Handle loader1,
+ Klass* klass2, Handle loader2);
+diff -r 79f7af7e8891 src/share/vm/classfile/systemDictionary.cpp
+--- a/src/share/vm/classfile/systemDictionary.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/systemDictionary.cpp Fri May 20 09:41:04 2016 -0700
@@ -182,6 +182,7 @@
// can return a null klass
klass = handle_resolution_exception(class_name, class_loader, protection_domain, throw_error, k_h, THREAD);
@@ -537,7 +570,7 @@ diff -r e9de8692675d src/share/vm/classfile/systemDictionary.cpp
Handle linkage_exception = Handle(); // null handle
-@@ -1610,6 +1636,14 @@
+@@ -1610,6 +1636,19 @@
return dictionary()->try_get_next_class();
}
@@ -549,10 +582,15 @@ diff -r e9de8692675d src/share/vm/classfile/systemDictionary.cpp
+ k->remove_from_sibling_list();
+ // TODO (DCEVM): Remove from interfaces.
+}
++
++// (DCEVM) Update constraints
++void SystemDictionary::update_constraints_after_redefinition() {
++ constraints()->update_after_redefinition();
++}
// ----------------------------------------------------------------------------
// Update hierachy. This is done before the new klass has been added to the SystemDictionary. The Recompile_lock
-@@ -1987,7 +2021,7 @@
+@@ -1987,7 +2026,7 @@
// also holds array classes
assert(check->oop_is_instance(), "noninstance in systemdictionary");
@@ -561,9 +599,9 @@ diff -r e9de8692675d src/share/vm/classfile/systemDictionary.cpp
linkage_error = "loader (instance of %s): attempted duplicate class "
"definition for name: \"%s\"";
} else {
-diff -r e9de8692675d src/share/vm/classfile/systemDictionary.hpp
---- a/src/share/vm/classfile/systemDictionary.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/systemDictionary.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/systemDictionary.hpp
+--- a/src/share/vm/classfile/systemDictionary.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/systemDictionary.hpp Fri May 20 09:41:04 2016 -0700
@@ -284,7 +284,7 @@
// Resolve from stream (called by jni_DefineClass and JVM_DefineClass)
static Klass* resolve_from_stream(Symbol* class_name, Handle class_loader,
@@ -573,17 +611,20 @@ diff -r e9de8692675d src/share/vm/classfile/systemDictionary.hpp
// Lookup an already loaded class. If not found NULL is returned.
static Klass* find(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS);
-@@ -358,6 +358,9 @@
+@@ -358,6 +358,12 @@
// System loader lock
static oop system_loader_lock() { return _system_loader_lock_obj; }
+ // (DCEVM) Remove link to hierarchy
+ static void remove_from_hierarchy(instanceKlassHandle k);
+
++ // (DCEVM) Update constraints
++ static void update_constraints_after_redefinition();
++
protected:
// Extended Redefine classes support (tbi)
static void preloaded_classes_do(KlassClosure* f);
-@@ -424,6 +427,9 @@
+@@ -424,6 +430,9 @@
initialize_wk_klasses_until((WKID) limit, start_id, THREAD);
}
@@ -593,7 +634,7 @@ diff -r e9de8692675d src/share/vm/classfile/systemDictionary.hpp
public:
#define WK_KLASS_DECLARE(name, symbol, option) \
static Klass* name() { return check_klass_##option(_well_known_klasses[WK_KLASS_ENUM_NAME(name)]); } \
-@@ -629,7 +635,7 @@
+@@ -629,7 +638,7 @@
// after waiting, but before reentering SystemDictionary_lock
// to preserve lock order semantics.
static void double_lock_wait(Handle lockObject, TRAPS);
@@ -602,9 +643,9 @@ diff -r e9de8692675d src/share/vm/classfile/systemDictionary.hpp
static instanceKlassHandle find_or_define_instance_class(Symbol* class_name,
Handle class_loader,
instanceKlassHandle k, TRAPS);
-diff -r e9de8692675d src/share/vm/classfile/verifier.cpp
---- a/src/share/vm/classfile/verifier.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/verifier.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/verifier.cpp
+--- a/src/share/vm/classfile/verifier.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/verifier.cpp Fri May 20 09:41:04 2016 -0700
@@ -189,7 +189,7 @@
Symbol* name = klass->name();
Klass* refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass();
@@ -632,9 +673,9 @@ diff -r e9de8692675d src/share/vm/classfile/verifier.cpp
int num_methods = methods->length();
for (int index = 0; index < num_methods; index++) {
-diff -r e9de8692675d src/share/vm/classfile/verifier.hpp
---- a/src/share/vm/classfile/verifier.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/classfile/verifier.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/classfile/verifier.hpp
+--- a/src/share/vm/classfile/verifier.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/classfile/verifier.hpp Fri May 20 09:41:04 2016 -0700
@@ -344,6 +344,7 @@
VerificationType object_type() const;
@@ -643,9 +684,9 @@ diff -r e9de8692675d src/share/vm/classfile/verifier.hpp
instanceKlassHandle _klass; // the class being verified
methodHandle _method; // current method being verified
VerificationType _this_type; // the verification type of the current class
-diff -r e9de8692675d src/share/vm/interpreter/linkResolver.cpp
---- a/src/share/vm/interpreter/linkResolver.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/interpreter/linkResolver.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/interpreter/linkResolver.cpp
+--- a/src/share/vm/interpreter/linkResolver.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/interpreter/linkResolver.cpp Fri May 20 09:41:04 2016 -0700
@@ -215,8 +215,8 @@
// Klass resolution
@@ -684,9 +725,9 @@ diff -r e9de8692675d src/share/vm/interpreter/linkResolver.cpp
selected_method = methodHandle(THREAD, inst->method_at_vtable(vtable_index));
}
}
-diff -r e9de8692675d src/share/vm/memory/universe.cpp
---- a/src/share/vm/memory/universe.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/memory/universe.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/memory/universe.cpp
+--- a/src/share/vm/memory/universe.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/memory/universe.cpp Fri May 20 09:41:04 2016 -0700
@@ -168,6 +168,43 @@
f(doubleArrayKlassObj());
}
@@ -731,9 +772,9 @@ diff -r e9de8692675d src/share/vm/memory/universe.cpp
void Universe::oops_do(OopClosure* f, bool do_all) {
f->do_oop((oop*) &_int_mirror);
-diff -r e9de8692675d src/share/vm/memory/universe.hpp
---- a/src/share/vm/memory/universe.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/memory/universe.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/memory/universe.hpp
+--- a/src/share/vm/memory/universe.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/memory/universe.hpp Fri May 20 09:41:04 2016 -0700
@@ -415,6 +415,7 @@
static void run_finalizers_on_exit();
@@ -742,9 +783,9 @@ diff -r e9de8692675d src/share/vm/memory/universe.hpp
// Apply "f" to the addresses of all the direct heap pointers maintained
// as static fields of "Universe".
-diff -r e9de8692675d src/share/vm/oops/cpCache.cpp
---- a/src/share/vm/oops/cpCache.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/cpCache.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/oops/cpCache.cpp
+--- a/src/share/vm/oops/cpCache.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/cpCache.cpp Fri May 20 09:41:04 2016 -0700
@@ -338,7 +338,8 @@
if (has_appendix) {
const int appendix_index = f2_as_index() + _indy_resolved_references_appendix_offset;
@@ -803,10 +844,10 @@ diff -r e9de8692675d src/share/vm/oops/cpCache.cpp
#endif // INCLUDE_JVMTI
-diff -r e9de8692675d src/share/vm/oops/cpCache.hpp
---- a/src/share/vm/oops/cpCache.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/cpCache.hpp Mon Dec 07 17:08:11 2015 -0800
-@@ -178,6 +178,8 @@
+diff -r 79f7af7e8891 src/share/vm/oops/cpCache.hpp
+--- a/src/share/vm/oops/cpCache.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/cpCache.hpp Fri May 20 09:41:04 2016 -0700
+@@ -179,6 +179,8 @@
tos_state_bits = 4,
tos_state_mask = right_n_bits(tos_state_bits),
tos_state_shift = BitsPerInt - tos_state_bits, // see verify_tos_state_shift below
@@ -815,7 +856,7 @@ diff -r e9de8692675d src/share/vm/oops/cpCache.hpp
// misc. option bits; can be any bit position in [16..27]
is_field_entry_shift = 26, // (F) is it a field or a method?
has_method_type_shift = 25, // (M) does the call site have a MethodType?
-@@ -210,6 +212,7 @@
+@@ -211,6 +213,7 @@
void initialize_resolved_reference_index(int ref_index) {
assert(_f2 == 0, "set once"); // note: ref_index might be zero also
_f2 = ref_index;
@@ -823,7 +864,7 @@ diff -r e9de8692675d src/share/vm/oops/cpCache.hpp
}
void set_field( // sets entry to resolved field state
-@@ -347,6 +350,7 @@
+@@ -348,6 +351,7 @@
bool is_final() const { return (_flags & (1 << is_final_shift)) != 0; }
bool is_forced_virtual() const { return (_flags & (1 << is_forced_virtual_shift)) != 0; }
bool is_vfinal() const { return (_flags & (1 << is_vfinal_shift)) != 0; }
@@ -831,7 +872,7 @@ diff -r e9de8692675d src/share/vm/oops/cpCache.hpp
bool has_appendix() const { return (!is_f1_null()) && (_flags & (1 << has_appendix_shift)) != 0; }
bool has_method_type() const { return (!is_f1_null()) && (_flags & (1 << has_method_type_shift)) != 0; }
bool is_method_entry() const { return (_flags & (1 << is_field_entry_shift)) == 0; }
-@@ -381,6 +385,10 @@
+@@ -376,6 +380,10 @@
bool* trace_name_printed);
bool check_no_old_or_obsolete_entries();
Method* get_interesting_method_entry(Klass* k);
@@ -842,7 +883,7 @@ diff -r e9de8692675d src/share/vm/oops/cpCache.hpp
#endif // INCLUDE_JVMTI
// Debugging & Printing
-@@ -479,6 +487,10 @@
+@@ -474,6 +482,10 @@
void adjust_method_entries(InstanceKlass* holder, bool* trace_name_printed);
bool check_no_old_or_obsolete_entries();
void dump_cache();
@@ -853,9 +894,9 @@ diff -r e9de8692675d src/share/vm/oops/cpCache.hpp
#endif // INCLUDE_JVMTI
// Deallocate - no fields to deallocate
-diff -r e9de8692675d src/share/vm/oops/instanceKlass.cpp
---- a/src/share/vm/oops/instanceKlass.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/instanceKlass.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/oops/instanceKlass.cpp
+--- a/src/share/vm/oops/instanceKlass.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/instanceKlass.cpp Fri May 20 09:41:04 2016 -0700
@@ -729,7 +729,8 @@
}
#endif
@@ -934,21 +975,21 @@ diff -r e9de8692675d src/share/vm/oops/instanceKlass.cpp
//
// Decrement count of the nmethod in the dependency list and remove
-@@ -1985,6 +2024,13 @@
+@@ -1995,6 +2034,13 @@
last = b;
b = b->next();
}
+
+ // (DCEVM) Hack as dependencies get wrong version of Klass*
+ if (this->old_version() != NULL) {
-+ InstanceKlass::cast(this->old_version())->remove_dependent_nmethod(nm);
++ InstanceKlass::cast(this->old_version())->remove_dependent_nmethod(nm, true);
+ return;
+ }
+
#ifdef ASSERT
tty->print_cr("### %s can't find dependent nmethod:", this->external_name());
nm->print();
-@@ -3035,6 +3081,24 @@
+@@ -3052,6 +3098,24 @@
assert(is_klass(), "must be klass");
Klass::print_on(st);
@@ -973,7 +1014,7 @@ diff -r e9de8692675d src/share/vm/oops/instanceKlass.cpp
st->print(BULLET"instance size: %d", size_helper()); st->cr();
st->print(BULLET"klass size: %d", size()); st->cr();
st->print(BULLET"access: "); access_flags().print_on(st); st->cr();
-@@ -3366,7 +3430,7 @@
+@@ -3383,7 +3447,7 @@
}
guarantee(sib->is_klass(), "should be klass");
@@ -982,7 +1023,7 @@ diff -r e9de8692675d src/share/vm/oops/instanceKlass.cpp
}
// Verify implementor fields
-@@ -3531,6 +3595,7 @@
+@@ -3548,6 +3612,7 @@
// Purge previous versions
static void purge_previous_versions_internal(InstanceKlass* ik, int emcp_method_count) {
@@ -990,7 +1031,7 @@ diff -r e9de8692675d src/share/vm/oops/instanceKlass.cpp
if (ik->previous_versions() != NULL) {
// This klass has previous versions so see what we can cleanup
// while it is safe to do so.
-@@ -3768,7 +3833,7 @@
+@@ -3785,7 +3850,7 @@
// Determine if InstanceKlass has a previous version.
bool InstanceKlass::has_previous_version() const {
@@ -999,9 +1040,9 @@ diff -r e9de8692675d src/share/vm/oops/instanceKlass.cpp
} // end has_previous_version()
-diff -r e9de8692675d src/share/vm/oops/instanceKlass.hpp
---- a/src/share/vm/oops/instanceKlass.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/instanceKlass.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/oops/instanceKlass.hpp
+--- a/src/share/vm/oops/instanceKlass.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/instanceKlass.hpp Fri May 20 09:41:04 2016 -0700
@@ -139,6 +139,7 @@
friend class VMStructs;
friend class ClassFileParser;
@@ -1046,9 +1087,9 @@ diff -r e9de8692675d src/share/vm/oops/instanceKlass.hpp
void methods_do(void f(Method* method));
void array_klasses_do(void f(Klass* k));
void array_klasses_do(void f(Klass* k, TRAPS), TRAPS);
-diff -r e9de8692675d src/share/vm/oops/klass.cpp
---- a/src/share/vm/oops/klass.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/klass.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/oops/klass.cpp
+--- a/src/share/vm/oops/klass.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/klass.cpp Fri May 20 09:41:04 2016 -0700
@@ -186,6 +186,13 @@
set_next_link(NULL);
TRACE_INIT_ID(this);
@@ -1088,9 +1129,9 @@ diff -r e9de8692675d src/share/vm/oops/klass.cpp
bool Klass::is_loader_alive(BoolObjectClosure* is_alive) {
#ifdef ASSERT
// The class is alive iff the class loader is alive.
-diff -r e9de8692675d src/share/vm/oops/klass.hpp
---- a/src/share/vm/oops/klass.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/klass.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/oops/klass.hpp
+--- a/src/share/vm/oops/klass.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/klass.hpp Fri May 20 09:41:04 2016 -0700
@@ -149,6 +149,10 @@
oop _java_mirror;
// Superclass
@@ -1198,9 +1239,9 @@ diff -r e9de8692675d src/share/vm/oops/klass.hpp
// Compiler support
static ByteSize super_offset() { return in_ByteSize(offset_of(Klass, _super)); }
-diff -r e9de8692675d src/share/vm/oops/klassVtable.cpp
---- a/src/share/vm/oops/klassVtable.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/klassVtable.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/oops/klassVtable.cpp
+--- a/src/share/vm/oops/klassVtable.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/klassVtable.cpp Fri May 20 09:41:04 2016 -0700
@@ -1450,6 +1450,8 @@
void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) {
@@ -1230,10 +1271,10 @@ diff -r e9de8692675d src/share/vm/oops/klassVtable.cpp
}
}
-diff -r e9de8692675d src/share/vm/oops/method.cpp
---- a/src/share/vm/oops/method.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/method.cpp Mon Dec 07 17:08:11 2015 -0800
-@@ -1208,6 +1208,8 @@
+diff -r 79f7af7e8891 src/share/vm/oops/method.cpp
+--- a/src/share/vm/oops/method.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/method.cpp Fri May 20 09:41:04 2016 -0700
+@@ -1197,6 +1197,8 @@
// Reset correct method/const method, method size, and parameter info
newm->set_constMethod(newcm);
@@ -1242,7 +1283,7 @@ diff -r e9de8692675d src/share/vm/oops/method.cpp
newm->constMethod()->set_code_size(new_code_length);
newm->constMethod()->set_constMethod_size(new_const_method_size);
newm->set_method_size(new_method_size);
-@@ -1812,6 +1814,10 @@
+@@ -1801,6 +1803,10 @@
// Add a method id to the jmethod_ids
jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
@@ -1253,21 +1294,20 @@ diff -r e9de8692675d src/share/vm/oops/method.cpp
ClassLoaderData* cld = loader_data;
if (!SafepointSynchronize::is_at_safepoint()) {
-diff -r e9de8692675d src/share/vm/oops/method.hpp
---- a/src/share/vm/oops/method.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/oops/method.hpp Mon Dec 07 17:08:11 2015 -0800
-@@ -105,6 +105,10 @@
+diff -r 79f7af7e8891 src/share/vm/oops/method.hpp
+--- a/src/share/vm/oops/method.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/oops/method.hpp Fri May 20 09:41:04 2016 -0700
+@@ -104,6 +104,9 @@
+ MethodCounters* _method_counters;
AccessFlags _access_flags; // Access flags
int _vtable_index; // vtable index of this method (see VtableIndexFlag)
- // note: can have vtables with >2**16 elements (because of inheritance)
+ // (DCEVM) Newer version of method available?
+ Method* _new_version;
+ Method* _old_version;
-+
- #ifdef CC_INTERP
- int _result_index; // C++ interpreter needs for converting results to/from stack
- #endif
-@@ -178,6 +182,23 @@
+ // note: can have vtables with >2**16 elements (because of inheritance)
+ u2 _method_size; // size of this object
+ u1 _intrinsic_id; // vmSymbols::intrinsic_id (0 == _none)
+@@ -175,6 +178,23 @@
int name_index() const { return constMethod()->name_index(); }
void set_name_index(int index) { constMethod()->set_name_index(index); }
@@ -1291,9 +1331,9 @@ diff -r e9de8692675d src/share/vm/oops/method.hpp
// signature
Symbol* signature() const { return constants()->symbol_at(signature_index()); }
int signature_index() const { return constMethod()->signature_index(); }
-diff -r e9de8692675d src/share/vm/prims/jni.cpp
---- a/src/share/vm/prims/jni.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/jni.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/jni.cpp
+--- a/src/share/vm/prims/jni.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/jni.cpp Fri May 20 09:41:04 2016 -0700
@@ -399,6 +399,7 @@
}
Klass* k = SystemDictionary::resolve_from_stream(class_name, class_loader,
@@ -1302,9 +1342,9 @@ diff -r e9de8692675d src/share/vm/prims/jni.cpp
CHECK_NULL);
if (TraceClassResolution && k != NULL) {
-diff -r e9de8692675d src/share/vm/prims/jvm.cpp
---- a/src/share/vm/prims/jvm.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/jvm.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/jvm.cpp
+--- a/src/share/vm/prims/jvm.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/jvm.cpp Fri May 20 09:41:04 2016 -0700
@@ -1029,6 +1029,7 @@
Klass* k = SystemDictionary::resolve_from_stream(class_name, class_loader,
protection_domain, &st,
@@ -1313,9 +1353,9 @@ diff -r e9de8692675d src/share/vm/prims/jvm.cpp
CHECK_NULL);
if (TraceClassResolution && k != NULL) {
-diff -r e9de8692675d src/share/vm/prims/jvmtiEnv.cpp
---- a/src/share/vm/prims/jvmtiEnv.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/jvmtiEnv.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/jvmtiEnv.cpp
+--- a/src/share/vm/prims/jvmtiEnv.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/jvmtiEnv.cpp Fri May 20 09:41:04 2016 -0700
@@ -43,6 +43,7 @@
#include "prims/jvmtiManageCapabilities.hpp"
#include "prims/jvmtiRawMonitor.hpp"
@@ -1361,9 +1401,9 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiEnv.cpp
VM_RedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
VMThread::execute(&op);
return (op.check_error());
-diff -r e9de8692675d src/share/vm/prims/jvmtiExport.hpp
---- a/src/share/vm/prims/jvmtiExport.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/jvmtiExport.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/jvmtiExport.hpp
+--- a/src/share/vm/prims/jvmtiExport.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/jvmtiExport.hpp Fri May 20 09:41:04 2016 -0700
@@ -188,6 +188,7 @@
// systems as needed to relax invariant checks.
static bool _has_redefined_a_class;
@@ -1372,9 +1412,9 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiExport.hpp
inline static void set_has_redefined_a_class() {
JVMTI_ONLY(_has_redefined_a_class = true;)
}
-diff -r e9de8692675d src/share/vm/prims/jvmtiImpl.cpp
---- a/src/share/vm/prims/jvmtiImpl.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/jvmtiImpl.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/jvmtiImpl.cpp
+--- a/src/share/vm/prims/jvmtiImpl.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/jvmtiImpl.cpp Fri May 20 09:41:04 2016 -0700
@@ -290,6 +290,11 @@
Symbol* m_name = _method->name();
Symbol* m_signature = _method->signature();
@@ -1387,10 +1427,10 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiImpl.cpp
// search previous versions if they exist
PreviousVersionWalker pvw(thread, (InstanceKlass *)ikh());
for (PreviousVersionNode * pv_node = pvw.next_previous_version();
-diff -r e9de8692675d src/share/vm/prims/jvmtiRedefineClasses2.cpp
+diff -r 79f7af7e8891 src/share/vm/prims/jvmtiRedefineClasses2.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp Mon Dec 07 17:08:11 2015 -0800
-@@ -0,0 +1,2108 @@
++++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp Fri May 20 09:41:04 2016 -0700
+@@ -0,0 +1,2112 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2706,6 +2746,7 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiRedefineClasses2.cpp
+ // Also, set array klasses element klass.
+ cur->set_array_klasses(array_klasses);
+ ObjArrayKlass::cast(array_klasses)->set_element_klass(cur);
++ ArrayKlass::cast(array_klasses)->set_component_mirror(cur->java_mirror());
+ }
+
+ // Initialize the new class! Special static initialization that does not execute the
@@ -2747,6 +2788,9 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiRedefineClasses2.cpp
+ // Disable any dependent concurrent compilations
+ SystemDictionary::notice_modification();
+
++ // Update klass pointers
++ SystemDictionary::update_constraints_after_redefinition();
++
+ // Set flag indicating that some invariants are no longer true.
+ // See jvmtiExport.hpp for detailed explanation.
+ JvmtiExport::set_has_redefined_a_class();
@@ -3499,9 +3543,9 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiRedefineClasses2.cpp
+ transfer.transfer_registrations(old_klass, _deleted_methods, _deleted_methods_length);
+ transfer.transfer_registrations(old_klass, _matching_old_methods, _matching_methods_length);
+}
-diff -r e9de8692675d src/share/vm/prims/jvmtiRedefineClasses2.hpp
+diff -r 79f7af7e8891 src/share/vm/prims/jvmtiRedefineClasses2.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/share/vm/prims/jvmtiRedefineClasses2.hpp Mon Dec 07 17:08:11 2015 -0800
++++ b/src/share/vm/prims/jvmtiRedefineClasses2.hpp Fri May 20 09:41:04 2016 -0700
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -3662,9 +3706,9 @@ diff -r e9de8692675d src/share/vm/prims/jvmtiRedefineClasses2.hpp
+};
+
+#endif // SHARE_VM_PRIMS_JVMTIENHANCEDREDEFINECLASSES_HPP
-diff -r e9de8692675d src/share/vm/prims/methodHandles.cpp
---- a/src/share/vm/prims/methodHandles.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/methodHandles.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/methodHandles.cpp
+--- a/src/share/vm/prims/methodHandles.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/methodHandles.cpp Fri May 20 09:41:04 2016 -0700
@@ -173,7 +173,7 @@
return NULL;
}
@@ -3684,9 +3728,9 @@ diff -r e9de8692675d src/share/vm/prims/methodHandles.cpp
return mname();
} else {
// Redefinition caused this to fail. Return NULL (and an exception?)
-diff -r e9de8692675d src/share/vm/prims/methodHandles.hpp
---- a/src/share/vm/prims/methodHandles.hpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/prims/methodHandles.hpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/prims/methodHandles.hpp
+--- a/src/share/vm/prims/methodHandles.hpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/prims/methodHandles.hpp Fri May 20 09:41:04 2016 -0700
@@ -60,7 +60,7 @@
static Handle new_MemberName(TRAPS); // must be followed by init_MemberName
static oop init_MemberName(Handle mname_h, Handle target_h); // compute vmtarget/vmindex from target
@@ -3696,9 +3740,9 @@ diff -r e9de8692675d src/share/vm/prims/methodHandles.hpp
static int method_ref_kind(Method* m, bool do_dispatch_if_possible = true);
static int find_MemberNames(KlassHandle k, Symbol* name, Symbol* sig,
int mflags, KlassHandle caller,
-diff -r e9de8692675d src/share/vm/runtime/reflection.cpp
---- a/src/share/vm/runtime/reflection.cpp Mon Dec 07 17:06:18 2015 -0800
-+++ b/src/share/vm/runtime/reflection.cpp Mon Dec 07 17:08:11 2015 -0800
+diff -r 79f7af7e8891 src/share/vm/runtime/reflection.cpp
+--- a/src/share/vm/runtime/reflection.cpp Fri May 20 09:33:23 2016 -0700
++++ b/src/share/vm/runtime/reflection.cpp Fri May 20 09:41:04 2016 -0700
@@ -520,6 +520,12 @@
AccessFlags access,
bool classloader_only,
diff --git a/debian/patches/series b/debian/patches/series
index 8a05025..8564ee9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,6 @@ arguments-java8u40.patch
gc-java8u40.patch
dmh-field-accessors-java8u40.patch
JVM_SetVmMemoryPressure.patch
-light-jdk8u66-b17.patch
+light-jdk8u92-b14.patch
light-jdk8u66-b17-deopt-cp.patch
+dont-clear-f1.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8-jre-dcevm.git
More information about the pkg-java-commits
mailing list