archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Vladimir Kozlov 2015-07-17 14:51:28 -07:00
commit 1e08e6133d
28 changed files with 2259 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/classfile/classFileParser.cpp
View file

@ -4171,10 +4171,13 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
}
}
#ifdef ASSERT
if (CheckIntrinsics) {
// Check for orphan methods in the current class. A method m
// of a class C is orphan if an intrinsic is defined for method m,
// but class C does not declare m.
// The check is potentially expensive, therefore it is available
// only in debug builds.
for (int id = vmIntrinsics::FIRST_ID; id < (int)vmIntrinsics::ID_LIMIT; id++) {
if (id == vmIntrinsics::_compiledLambdaForm) {
@ -4210,8 +4213,10 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
}
}
}
#endif // ASSERT
}
if (cached_class_file != NULL) {
// JVMTI: we have an InstanceKlass now, tell it about the cached bytes
this_klass->set_cached_class_file(cached_class_file);