stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2017-02-18 03:23:28 +01:00
commit 4edb348b34
6 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/autoconf/generated-configure.sh
View File

@ -5170,7 +5170,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1486679715
DATE_WHEN_GENERATED=1487384601
###############################################################################
#
@ -52643,12 +52643,12 @@ $as_echo "no, forced" >&6; }
# Only enable AOT on linux-X64.
if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
ENABLE_AOT="true"
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
as_fn_error $? "Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
as_fn_error $? "Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
fi
fi
else
@ -64379,8 +64379,8 @@ $as_echo "$JVM_FEATURES" >&6; }
JVM_FEATURES_jvmci=""
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jdk.vm.compiler should be built" >&5
$as_echo_n "checking if jdk.vm.compiler should be built... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jdk.internal.vm.compiler should be built" >&5
$as_echo_n "checking if jdk.internal.vm.compiler should be built... " >&6; }
if [[ " $JVM_FEATURES " =~ " graal " ]] ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
$as_echo "yes, forced" >&6; }

6
common/autoconf/hotspot.m4
View File

@ -215,12 +215,12 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
# Only enable AOT on linux-X64.
if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
ENABLE_AOT="true"
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot.])
AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
fi
fi
else
@ -327,7 +327,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
JVM_FEATURES_jvmci=""
fi
AC_MSG_CHECKING([if jdk.vm.compiler should be built])
AC_MSG_CHECKING([if jdk.internal.vm.compiler should be built])
if HOTSPOT_CHECK_JVM_FEATURE(graal); then
AC_MSG_RESULT([yes, forced])
if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then

16
make/CompileJavaModules.gmk
View File

@ -462,13 +462,13 @@ jdk.internal.jvmstat_COPY := aliasmap
# JVMCI compilers make use of that information for various sanity checks.
# Don't use Indy strings concatenation to have good JVMCI startup performance.
jdk.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline
jdk.internal.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline
################################################################################
jdk.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
jdk.internal.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
jdk.vm.compiler_EXCLUDES += \
jdk.internal.vm.compiler_EXCLUDES += \
org.graalvm.compiler.core.match.processor \
org.graalvm.compiler.nodeinfo.processor \
org.graalvm.compiler.options.processor \
@ -557,16 +557,16 @@ MODULESOURCEPATH := $(call GetModuleSrcPath)
# Add imported modules to the modulepath
MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
ifeq ($(MODULE), jdk.vm.ci)
## WORKAROUND jdk.vm.ci source structure issue
ifeq ($(MODULE), jdk.internal.vm.ci)
## WORKAROUND jdk.internal.vm.ci source structure issue
JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
$(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
$(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
endif
ifeq ($(MODULE), jdk.vm.compiler)
## WORKAROUND jdk.vm.compiler source structure issue
ifeq ($(MODULE), jdk.internal.vm.compiler)
## WORKAROUND jdk.internal.vm.compiler source structure issue
VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
$(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))

16
make/Main.gmk
View File

@ -633,16 +633,16 @@ else
# in javadoc.
java.desktop-gensrc-jdk: java.base-gensrc
# The annotation processing for jdk.vm.ci and jdk.vm.compiler needs classes
# from the current JDK.
jdk.vm.ci-gensrc-hotspot: $(addsuffix -java, \
$(call FindTransitiveDepsForModule, jdk.vm.ci))
jdk.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
$(call FindTransitiveDepsForModule, jdk.vm.compiler))
# The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
# needs classes from the current JDK.
jdk.internal.vm.ci-gensrc-hotspot: $(addsuffix -java, \
$(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
jdk.internal.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
$(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
# For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
# For jdk.internal.vm.compiler, the gensrc step is generating a module-info.java.extra
# file to be processed by the gensrc-moduleinfo target.
jdk.vm.compiler-gensrc-moduleinfo: jdk.vm.compiler-gensrc-hotspot
jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-hotspot
# Explicitly add dependencies for special targets
java.base-java: unpack-sec

6
make/common/Modules.gmk
View File

@ -63,7 +63,7 @@ BOOT_MODULES += \
jdk.net \
jdk.sctp \
jdk.unsupported \
jdk.vm.ci \
jdk.internal.vm.ci \
#
# to be deprivileged
@ -114,7 +114,7 @@ PLATFORM_MODULES += \
jdk.scripting.nashorn \
jdk.security.auth \
jdk.security.jgss \
jdk.vm.compiler \
jdk.internal.vm.compiler \
jdk.xml.dom \
jdk.zipfs \
#
@ -147,7 +147,7 @@ endif
# Filter out Graal specific modules if Graal build is disabled
ifeq ($(INCLUDE_GRAAL), false)
MODULES_FILTER += jdk.vm.compiler
MODULES_FILTER += jdk.internal.vm.compiler
endif
################################################################################

20
test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
View File

@ -199,6 +199,10 @@ public abstract class CommandLineOptionTest {
throws Throwable {
List<String> finalOptions = new ArrayList<>();
finalOptions.add(CommandLineOptionTest.getVMTypeOption());
String extraFlagForEmulated = CommandLineOptionTest.getVMTypeOptionForEmulated();
if (extraFlagForEmulated != null) {
finalOptions.add(extraFlagForEmulated);
}
Collections.addAll(finalOptions, options);
CommandLineOptionTest.verifyJVMStartup(expectedMessages,
@ -390,6 +394,10 @@ public abstract class CommandLineOptionTest {
String... additionalVMOpts) throws Throwable {
List<String> finalOptions = new ArrayList<>();
finalOptions.add(CommandLineOptionTest.getVMTypeOption());
String extraFlagForEmulated = CommandLineOptionTest.getVMTypeOptionForEmulated();
if (extraFlagForEmulated != null) {
finalOptions.add(extraFlagForEmulated);
}
Collections.addAll(finalOptions, additionalVMOpts);
CommandLineOptionTest.verifyOptionValue(optionName, expectedValue,
@ -497,6 +505,18 @@ public abstract class CommandLineOptionTest {
throw new RuntimeException("Unknown VM mode.");
}
/**
* @return addtional VMoptions(Emulated related) required to start a new VM with the same type as current.
*/
private static String getVMTypeOptionForEmulated() {
if (Platform.isServer() && !Platform.isEmulatedClient()) {
return "-XX:-NeverActAsServerClassMachine";
} else if (Platform.isEmulatedClient()) {
return "-XX:+NeverActAsServerClassMachine";
}
return null;
}
private final BooleanSupplier predicate;
/**