# HG changeset patch # User pli # Date 1567129120 -28800 # Node ID 4364524f8cacc5f87f6f90fb3a303856c97f0deb # Parent e0b8b019d2f5472c726633464ecf27abdbbadd06 8229797: [JVMCI] Clean up no longer used JVMCI::dependencies_invalid value Reviewed-by: dlong, coleenp Contributed-by: doug.simon@oracle.com, xiaohong.gong@arm.com diff -r e0b8b019d2f5 -r 4364524f8cac src/hotspot/share/jvmci/jvmci.hpp --- a/src/hotspot/share/jvmci/jvmci.hpp Thu Aug 29 16:31:34 2019 -0700 +++ b/src/hotspot/share/jvmci/jvmci.hpp Fri Aug 30 09:38:40 2019 +0800 @@ -60,7 +60,6 @@ enum CodeInstallResult { ok, dependencies_failed, - dependencies_invalid, cache_full, code_too_large }; diff -r e0b8b019d2f5 -r 4364524f8cac src/hotspot/share/jvmci/jvmciRuntime.cpp --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp Thu Aug 29 16:31:34 2019 -0700 +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp Fri Aug 30 09:38:40 2019 +0800 @@ -1310,21 +1310,13 @@ return JVMCI::dependencies_failed; } - // Dependencies must be checked when the system dictionary changes - // or if we don't know whether it has changed (i.e., compile_state == NULL). CompileTask* task = compile_state == NULL ? NULL : compile_state->task(); Dependencies::DepType result = dependencies->validate_dependencies(task, failure_detail); if (result == Dependencies::end_marker) { return JVMCI::ok; } - if (!Dependencies::is_klass_type(result) || compile_state == NULL) { - return JVMCI::dependencies_failed; - } - // The dependencies were invalid at the time of installation - // without any intervening modification of the system - // dictionary. That means they were invalidly constructed. - return JVMCI::dependencies_invalid; + return JVMCI::dependencies_failed; } // Reports a pending exception and exits the VM. diff -r e0b8b019d2f5 -r 4364524f8cac src/hotspot/share/jvmci/vmStructs_jvmci.cpp --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Thu Aug 29 16:31:34 2019 -0700 +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Fri Aug 30 09:38:40 2019 +0800 @@ -544,11 +544,10 @@ declare_constant(JumpData::taken_off_set) \ declare_constant(JumpData::displacement_off_set) \ \ - declare_preprocessor_constant("JVMCIEnv::ok", JVMCI::ok) \ - declare_preprocessor_constant("JVMCIEnv::dependencies_failed", JVMCI::dependencies_failed) \ - declare_preprocessor_constant("JVMCIEnv::dependencies_invalid", JVMCI::dependencies_invalid) \ - declare_preprocessor_constant("JVMCIEnv::cache_full", JVMCI::cache_full) \ - declare_preprocessor_constant("JVMCIEnv::code_too_large", JVMCI::code_too_large) \ + declare_preprocessor_constant("JVMCI::ok", JVMCI::ok) \ + declare_preprocessor_constant("JVMCI::dependencies_failed", JVMCI::dependencies_failed) \ + declare_preprocessor_constant("JVMCI::cache_full", JVMCI::cache_full) \ + declare_preprocessor_constant("JVMCI::code_too_large", JVMCI::code_too_large) \ declare_constant(JVMCIRuntime::none) \ declare_constant(JVMCIRuntime::by_holder) \ declare_constant(JVMCIRuntime::by_full_signature) \ diff -r e0b8b019d2f5 -r 4364524f8cac src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java Thu Aug 29 16:31:34 2019 -0700 +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java Fri Aug 30 09:38:40 2019 +0800 @@ -372,9 +372,8 @@ * @return the outcome of the installation which will be one of * {@link HotSpotVMConfig#codeInstallResultOk}, * {@link HotSpotVMConfig#codeInstallResultCacheFull}, - * {@link HotSpotVMConfig#codeInstallResultCodeTooLarge}, - * {@link HotSpotVMConfig#codeInstallResultDependenciesFailed} or - * {@link HotSpotVMConfig#codeInstallResultDependenciesInvalid}. + * {@link HotSpotVMConfig#codeInstallResultCodeTooLarge} or + * {@link HotSpotVMConfig#codeInstallResultDependenciesFailed}. * @throws JVMCIError if there is something wrong with the compiled code or the associated * metadata. */ @@ -390,9 +389,8 @@ * @return the outcome of the installation which will be one of * {@link HotSpotVMConfig#codeInstallResultOk}, * {@link HotSpotVMConfig#codeInstallResultCacheFull}, - * {@link HotSpotVMConfig#codeInstallResultCodeTooLarge}, - * {@link HotSpotVMConfig#codeInstallResultDependenciesFailed} or - * {@link HotSpotVMConfig#codeInstallResultDependenciesInvalid}. + * {@link HotSpotVMConfig#codeInstallResultCodeTooLarge} or + * {@link HotSpotVMConfig#codeInstallResultDependenciesFailed}. * @throws JVMCIError if there is something wrong with the compiled code or the metadata */ native int getMetadata(TargetDescription target, HotSpotCompiledCode compiledCode, HotSpotMetaData metaData); diff -r e0b8b019d2f5 -r 4364524f8cac src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java Thu Aug 29 16:31:34 2019 -0700 +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java Fri Aug 30 09:38:40 2019 +0800 @@ -144,9 +144,6 @@ } else { msg = String.format("Code installation failed: %s", resultDesc); } - if (result == config.codeInstallResultDependenciesInvalid) { - throw new AssertionError(resultDesc + " " + msg); - } throw new BailoutException(result != config.codeInstallResultDependenciesFailed, msg); } else { throw new BailoutException("Error installing %s: %s", ((HotSpotCompiledCode) compiledCode).getName(), resultDesc); diff -r e0b8b019d2f5 -r 4364524f8cac src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java Thu Aug 29 16:31:34 2019 -0700 +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java Fri Aug 30 09:38:40 2019 +0800 @@ -351,11 +351,10 @@ final int vmIntrinsicLinkToSpecial = getConstant("vmIntrinsics::_linkToSpecial", Integer.class); final int vmIntrinsicLinkToInterface = getConstant("vmIntrinsics::_linkToInterface", Integer.class); - final int codeInstallResultOk = getConstant("JVMCIEnv::ok", Integer.class); - final int codeInstallResultDependenciesFailed = getConstant("JVMCIEnv::dependencies_failed", Integer.class); - final int codeInstallResultDependenciesInvalid = getConstant("JVMCIEnv::dependencies_invalid", Integer.class); - final int codeInstallResultCacheFull = getConstant("JVMCIEnv::cache_full", Integer.class); - final int codeInstallResultCodeTooLarge = getConstant("JVMCIEnv::code_too_large", Integer.class); + final int codeInstallResultOk = getConstant("JVMCI::ok", Integer.class); + final int codeInstallResultDependenciesFailed = getConstant("JVMCI::dependencies_failed", Integer.class); + final int codeInstallResultCacheFull = getConstant("JVMCI::cache_full", Integer.class); + final int codeInstallResultCodeTooLarge = getConstant("JVMCI::code_too_large", Integer.class); String getCodeInstallResultDescription(int codeInstallResult) { if (codeInstallResult == codeInstallResultOk) { @@ -364,9 +363,6 @@ if (codeInstallResult == codeInstallResultDependenciesFailed) { return "dependencies failed"; } - if (codeInstallResult == codeInstallResultDependenciesInvalid) { - return "dependencies invalid"; - } if (codeInstallResult == codeInstallResultCacheFull) { return "code cache is full"; }