8036956: remove EnableInvokeDynamic flag

The EnableInvokeDynamic flag and all support code is removed because it is not longer used in JDK 9.

Reviewed-by: kvn, twisti
This commit is contained in:
Tobias Hartmann 2014-04-29 08:08:44 +02:00 committed by Albert Noll
parent 3fddcd2712
commit 06c26b6f97
35 changed files with 51 additions and 235 deletions

View file

@ -59,7 +59,7 @@ MethodHandlesAdapterBlob* MethodHandles::_adapter_code = NULL;
// MethodHandles::generate_adapters
//
void MethodHandles::generate_adapters() {
if (!EnableInvokeDynamic || SystemDictionary::MethodHandle_klass() == NULL) return;
if (SystemDictionary::MethodHandle_klass() == NULL) return;
assert(_adapter_code == NULL, "generate only once");
@ -98,7 +98,7 @@ void MethodHandlesAdapterGenerator::generate() {
void MethodHandles::set_enabled(bool z) {
if (_enabled != z) {
guarantee(z && EnableInvokeDynamic, "can only enable once, and only if -XX:+EnableInvokeDynamic");
guarantee(z, "can only enable once");
_enabled = z;
}
}
@ -1374,11 +1374,6 @@ static bool register_natives(JNIEnv* env, jclass clazz, const JNINativeMethod* m
* This one function is exported, used by NativeLookup.
*/
JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class)) {
if (!EnableInvokeDynamic) {
warning("JSR 292 is disabled in this JVM. Use -XX:+UnlockDiagnosticVMOptions -XX:+EnableInvokeDynamic to enable.");
return; // bind nothing
}
assert(!MethodHandles::enabled(), "must not be enabled");
bool enable_MH = true;