Skip to content

Commit 38d43e2

Browse files
committed
remove workaround needed for JDK without JDK-8235908
1 parent c5d89ae commit 38d43e2

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

sdk/mx.sdk/mx_sdk_vm.py

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -635,23 +635,6 @@ def jlink_has_save_jlink_argfiles(jdk):
635635
"""
636636
return _probe_jlink_info(jdk, '.supports_JDK_8237467')
637637

638-
def _jdk_omits_warning_for_jlink_set_ThreadPriorityPolicy(jdk): # pylint: disable=invalid-name
639-
"""
640-
Determines if the `jdk` suppresses a warning about ThreadPriorityPolicy when it
641-
is non-zero if the value is set from the jimage.
642-
https://bugs.openjdk.java.net/browse/JDK-8235908.
643-
"""
644-
if not hasattr(jdk, '.omits_ThreadPriorityPolicy_warning'):
645-
out = mx.OutputCapture()
646-
sink = lambda x: x
647-
tmpdir = tempfile.mkdtemp(prefix='jdk_omits_warning_for_jlink_set_ThreadPriorityPolicy')
648-
jlink_exe = jdk.javac.replace('javac', 'jlink')
649-
mx.run([jlink_exe, '--add-options=-XX:ThreadPriorityPolicy=1', '--output=' + join(tmpdir, 'jdk'), '--add-modules=java.base'])
650-
mx.run([mx.exe_suffix(join(tmpdir, 'jdk', 'bin', 'java')), '-version'], out=sink, err=out)
651-
shutil.rmtree(tmpdir)
652-
setattr(jdk, '.omits_ThreadPriorityPolicy_warning', '-XX:ThreadPriorityPolicy=1 may require system level permission' not in out.data)
653-
return getattr(jdk, '.omits_ThreadPriorityPolicy_warning')
654-
655638
def _read_java_base_hashes(jdk):
656639
"""
657640
Read the hashes stored in the ``java.base`` module of `jdk`.
@@ -817,10 +800,7 @@ def _get_image_vm_options(jdk, use_upgrade_module_path, modules, synthetic_modul
817800
mx.log('Adding -Djdk.graal.SystemicCompilationFailureRate=-1 VM option to image')
818801
vm_options.append('-Djdk.graal.SystemicCompilationFailureRate=-1')
819802

820-
if use_upgrade_module_path or _jdk_omits_warning_for_jlink_set_ThreadPriorityPolicy(jdk):
821-
vm_options.append('-XX:ThreadPriorityPolicy=1')
822-
else:
823-
mx.logv('[Creating JDK without -XX:ThreadPriorityPolicy=1]')
803+
vm_options.append('-XX:ThreadPriorityPolicy=1')
824804

825805
if jdk_supports_enablejvmciproduct(jdk):
826806
non_synthetic_modules = [m.name for m in modules if m not in synthetic_modules]

0 commit comments

Comments
 (0)