Ivan Dubrov
10 years ago
1 changed files with 5 additions and 3 deletions
+ 5
- 3
hotspot/.hg/patches/light-jdk8u5-b13.patch
View File
| resolved_references->obj_at_put(method_type_index, method_type()); | resolved_references->obj_at_put(method_type_index, method_type()); | ||||
| } | } | ||||
| @@ -532,6 +534,26 @@ | |||||
| @@ -532,6 +534,27 @@ | |||||
| // the method is in the interesting class so the entry is interesting | // the method is in the interesting class so the entry is interesting | ||||
| return true; | return true; | ||||
| } | } | ||||
| + // FIXME: (DCEVM) we want to clear flags, but parameter size is actually used | + // 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 | + // after we return from the method, before entry is re-initialized. So let's | ||||
| + // keep parameter size the same. | + // keep parameter size the same. | ||||
| + // For example, it's used in TemplateInterpreterGenerator::generate_return_entry_for | |||||
| + _flags &= 0x0000000f; | + _flags &= 0x0000000f; | ||||
| +} | +} | ||||
| #endif // INCLUDE_JVMTI | #endif // INCLUDE_JVMTI | ||||
| void ConstantPoolCacheEntry::print(outputStream* st, int index) const { | void ConstantPoolCacheEntry::print(outputStream* st, int index) const { | ||||
| @@ -660,6 +682,14 @@ | |||||
| @@ -660,6 +683,14 @@ | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| new file mode 100644 | new file mode 100644 | ||||
| --- /dev/null | --- /dev/null | ||||
| +++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp | +++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp | ||||
| @@ -0,0 +1,2085 @@ | |||||
| @@ -0,0 +1,2086 @@ | |||||
| +/* | +/* | ||||
| + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. | + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. | ||||
| + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||||
| + instanceKlassHandle klass_handle(Thread::current(), java_lang_Class::as_Klass(mirror)); | + instanceKlassHandle klass_handle(Thread::current(), java_lang_Class::as_Klass(mirror)); | ||||
| + klass_handle->set_redefinition_flag(Klass::MarkedAsAffected); | + klass_handle->set_redefinition_flag(Klass::MarkedAsAffected); | ||||
| + assert(klass_handle->new_version() == NULL, "Must be new class"); | + assert(klass_handle->new_version() == NULL, "Must be new class"); | ||||
| + RC_TRACE(0x00000001, ("Class being reloaded: %s", klass_handle->name()->as_C_string())); | |||||
| + } | + } | ||||
| + | + | ||||
| + // Find classes not directly redefined, but affected by a redefinition (because one of its supertypes is redefined) | + // Find classes not directly redefined, but affected by a redefinition (because one of its supertypes is redefined) |
Loading…