From bc6e52c2b3e1cb74b61873d0925c812157064064 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Sat, 17 Jun 2017 11:50:50 -0700 Subject: [PATCH] 8182416: Clean up module-info.java like move requires transitive adjacent to exports Reviewed-by: alanb --- hotspot/src/jdk.aot/share/classes/module-info.java | 9 ++++++++- .../share/classes/module-info.java | 6 ++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hotspot/src/jdk.aot/share/classes/module-info.java b/hotspot/src/jdk.aot/share/classes/module-info.java index 14d11197356..ced0bf61cfd 100644 --- a/hotspot/src/jdk.aot/share/classes/module-info.java +++ b/hotspot/src/jdk.aot/share/classes/module-info.java @@ -23,8 +23,15 @@ * questions. */ +/** + * Defines the Ahead-of-Time (AOT) compiler, {@index jaotc jaotc tool}, + * for compiling Java classes into AOT library. + * + * @moduleGraph + * @since 9 + */ module jdk.aot { - requires jdk.management; requires jdk.internal.vm.ci; requires jdk.internal.vm.compiler; + requires jdk.management; } diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java b/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java index 783eef09fa5..0c96fff59a4 100644 --- a/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java +++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java @@ -26,11 +26,9 @@ module jdk.internal.vm.compiler { requires java.instrument; requires java.management; - requires jdk.management; requires jdk.internal.vm.ci; - - // sun.misc.Unsafe is used - requires jdk.unsupported; + requires jdk.management; + requires jdk.unsupported; // sun.misc.Unsafe is used uses org.graalvm.compiler.code.DisassemblerProvider; uses org.graalvm.compiler.core.match.MatchStatementSet;