mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 14:54:52 +02:00
Merge
This commit is contained in:
commit
67a5fc2529
76 changed files with 592 additions and 860 deletions
|
@ -3654,14 +3654,14 @@ void JNIid::verify(Klass* holder) {
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef ASSERT
|
||||
void InstanceKlass::set_init_state(ClassState state) {
|
||||
#ifdef ASSERT
|
||||
bool good_state = is_shared() ? (_init_state <= state)
|
||||
: (_init_state < state);
|
||||
assert(good_state || state == allocated, "illegal state transition");
|
||||
#endif
|
||||
_init_state = (u1)state;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if INCLUDE_JVMTI
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue