Skip to content
Permalink
Browse files
Merge jdk
Merge tag 'jdk-18+2'
  • Loading branch information
David Simms committed Jun 17, 2021
2 parents 0a85431 + 72b3b0a commit 85af6b560efc65b40fd0ec43e16ae7e27a563518
Showing with 3,399 additions and 948 deletions.
  1. +111 −126 bin/idea.sh
  2. +5 −0 make/autoconf/jvm-features.m4
  3. +1 −0 make/autoconf/spec.gmk.in
  4. +39 −0 make/data/symbols/java.base-H.sym.txt
  5. +38 −1 make/data/symbols/jdk.compiler-H.sym.txt
  6. +10 −14 make/data/symbols/jdk.incubator.foreign-H.sym.txt
  7. +54 −0 make/data/symbols/jdk.incubator.vector-H.sym.txt
  8. +5 −0 make/data/symbols/jdk.javadoc-H.sym.txt
  9. +31 −0 make/data/symbols/jdk.jfr-H.sym.txt
  10. +31 −0 make/data/symbols/jdk.management.jfr-H.sym.txt
  11. +1 −1 make/data/symbols/symbols
  12. +42 −0 make/ide/idea/jdk/build.xml
  13. +6 −9 make/ide/idea/jdk/idea.gmk
  14. +14 −0 make/ide/idea/jdk/template/ant.xml
  15. +4 −4 make/ide/idea/jdk/template/compiler.xml
  16. +4 −3 make/ide/idea/jdk/template/jdk.iml
  17. +4 −1 make/ide/idea/jdk/template/misc.xml
  18. +0 −2 make/ide/idea/jdk/template/modules.xml
  19. +13 −0 make/ide/idea/jdk/template/src/idea/IdeaLoggerWrapper.java
  20. +375 −0 make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java
  21. +1 −1 make/ide/idea/jdk/template/vcs.xml
  22. +53 −52 make/ide/idea/jdk/template/workspace.xml
  23. +4 −3 make/jdk/src/classes/build/tools/dtdbuilder/DTDBuilder.java
  24. +1 −1 make/modules/jdk.incubator.vector/Lib.gmk
  25. +1 −23 make/test/BuildFailureHandler.gmk
  26. +74 −0 src/hotspot/os/windows/os_windows.cpp
  27. +2 −1 src/hotspot/share/c1/c1_Compiler.cpp
  28. +62 −43 src/hotspot/share/c1/c1_LIRGenerator.cpp
  29. +1 −3 src/hotspot/share/c1/c1_LIRGenerator.hpp
  30. +17 −5 src/hotspot/share/c1/c1_LinearScan.cpp
  31. +0 −3 src/hotspot/share/c1/c1_globals.hpp
  32. +4 −3 src/hotspot/share/cds/classListParser.cpp
  33. +3 −3 src/hotspot/share/cds/metaspaceShared.cpp
  34. +5 −3 src/hotspot/share/classfile/javaAssertions.cpp
  35. +3 −84 src/hotspot/share/classfile/javaClasses.cpp
  36. +2 −16 src/hotspot/share/classfile/javaClasses.hpp
  37. +1 −2 src/hotspot/share/classfile/systemDictionary.cpp
  38. +21 −3 src/hotspot/share/classfile/systemDictionaryShared.cpp
  39. +1 −0 src/hotspot/share/classfile/systemDictionaryShared.hpp
  40. +2 −6 src/hotspot/share/classfile/vmIntrinsics.cpp
  41. +0 −4 src/hotspot/share/classfile/vmIntrinsics.hpp
  42. +2 −0 src/hotspot/share/classfile/vmSymbols.hpp
  43. +1 −2 src/hotspot/share/gc/epsilon/epsilonHeap.cpp
  44. +1 −3 src/hotspot/share/gc/serial/defNewGeneration.cpp
  45. +2 −3 src/hotspot/share/gc/serial/defNewGeneration.hpp
  46. +4 −28 src/hotspot/share/gc/serial/tenuredGeneration.cpp
  47. +2 −4 src/hotspot/share/gc/serial/tenuredGeneration.hpp
  48. +2 −0 src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
  49. +2 −4 src/hotspot/share/gc/shared/generation.hpp
  50. +9 −0 src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
  51. +4 −0 src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
  52. +45 −2 src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
  53. +1 −1 src/hotspot/share/interpreter/rewriter.cpp
  54. +2 −2 src/hotspot/share/memory/virtualspace.cpp
  55. +2 −2 src/hotspot/share/memory/virtualspace.hpp
  56. +1 −1 src/hotspot/share/oops/constantPool.cpp
  57. +8 −8 src/hotspot/share/oops/instanceKlass.cpp
  58. +5 −5 src/hotspot/share/oops/klass.hpp
  59. +3 −3 src/hotspot/share/oops/klassVtable.cpp
  60. +2 −2 src/hotspot/share/oops/method.cpp
  61. +15 −1 src/hotspot/share/opto/c2compiler.cpp
  62. +2 −1 src/hotspot/share/opto/c2compiler.hpp
  63. +48 −18 src/hotspot/share/opto/callnode.cpp
  64. +4 −2 src/hotspot/share/opto/callnode.hpp
  65. +107 −1 src/hotspot/share/opto/compile.cpp
  66. +19 −1 src/hotspot/share/opto/compile.hpp
  67. +2 −0 src/hotspot/share/opto/library_call.cpp
  68. +8 −2 src/hotspot/share/opto/locknode.cpp
  69. +2 −2 src/hotspot/share/opto/locknode.hpp
  70. +13 −11 src/hotspot/share/opto/macro.cpp
  71. +2 −0 src/hotspot/share/opto/macroArrayCopy.cpp
  72. +8 −12 src/hotspot/share/runtime/arguments.cpp
  73. +8 −1 src/hotspot/share/runtime/thread.inline.hpp
  74. +1 −1 src/hotspot/share/runtime/vframe.cpp
  75. +20 −0 src/hotspot/share/utilities/hashtable.hpp
  76. +1 −1 src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrap.java
  77. +1 −1 src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrapPadded.java
  78. +40 −36 src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
  79. +25 −66 src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java
  80. +7 −1 src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
  81. +1 −0 src/java.base/share/classes/com/sun/crypto/provider/KWUtil.java
  82. +28 −7 src/java.base/share/classes/com/sun/crypto/provider/KeyWrapCipher.java
  83. +3 −2 src/java.base/share/classes/java/lang/AutoCloseable.java
  84. +2 −5 src/java.base/share/classes/java/nio/Buffer.java
  85. +3 −0 src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
  86. +11 −0 src/java.base/share/classes/sun/security/jca/Providers.java
  87. +5 −0 src/java.base/share/classes/sun/security/x509/AlgorithmId.java
  88. +42 −82 src/java.base/share/man/java.1
  89. +35 −9 src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
  90. +1 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
  91. +4 −0 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
  92. +4 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
  93. +3 −0 src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
  94. +4 −4 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
  95. +2 −2 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
  96. +10 −8 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
  97. +1 −1 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
  98. +3 −3 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
  99. +1 −1 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
  100. +2 −11 test/failure_handler/Makefile
  101. +1 −29 ...lure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.java
  102. +5 −0 test/failure_handler/src/share/conf/linux.properties
  103. +5 −0 test/failure_handler/src/share/conf/mac.properties
  104. +6 −1 test/failure_handler/src/share/conf/windows.properties
  105. +0 −37 test/failure_handler/src/windows/native/libtimeoutHandler/GatherProcessInfoTimeoutHandler.c
  106. +2 −0 test/hotspot/jtreg/ProblemList-Xcomp.txt
  107. +10 −3 test/hotspot/jtreg/ProblemList-zgc.txt
  108. +3 −0 test/hotspot/jtreg/ProblemList.txt
  109. +1 −0 test/hotspot/jtreg/TEST.groups
  110. +288 −5 test/hotspot/jtreg/compiler/arraycopy/TestObjectArrayClone.java
  111. +197 −0 test/hotspot/jtreg/compiler/c1/TestCheckIndexC1Intrinsic.java
  112. +56 −0 test/hotspot/jtreg/compiler/c1/TestLinearScanHasFPURegisters.java
  113. +150 −0 test/hotspot/jtreg/compiler/locks/TestNestedLocksElimination.java
  114. +71 −0 test/hotspot/jtreg/gc/shenandoah/options/TestLargePagesWithSmallHeap.java
  115. +68 −0 test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JFRDynamicCDS.java
  116. +82 −0 test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/JFRDynamicCDSApp.java
  117. +1 −1 test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java
  118. +2 −2 test/hotspot/jtreg/runtime/memory/LargePages/TestLargePagesFlags.java
  119. +2 −1 test/hotspot/jtreg/runtime/os/AvailableProcessors.java
  120. +2 −1 test/hotspot/jtreg/runtime/os/TestUseCpuAllocPath.java
  121. +2 −2 test/hotspot/jtreg/runtime/records/RedefineRecord.java
  122. +33 −10 test/jdk/com/sun/crypto/provider/Cipher/KeyWrap/TestGeneral.java
  123. +3 −1 test/jdk/java/awt/Robot/InfiniteLoopException.java
  124. +134 −0 test/jdk/java/awt/print/PrinterJob/ExceptionFromPrintableIsIgnoredTest.java
  125. +48 −6 test/jdk/java/foreign/channels/TestAsyncSocketChannels.java
  126. +96 −0 test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java
  127. +28 −3 test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
  128. +28 −3 test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
  129. +28 −3 test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
  130. +36 −3 test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
  131. +28 −3 test/jdk/java/net/httpclient/CancelRequestTest.java
  132. +28 −3 test/jdk/java/net/httpclient/ForbiddenHeadTest.java
  133. +26 −3 test/jdk/java/net/httpclient/ISO_8859_1_Test.java
  134. +28 −2 test/jdk/java/net/httpclient/ProxySelectorTest.java
  135. +29 −3 test/jdk/java/net/httpclient/Response204V2Test.java
  136. +45 −2 test/jdk/java/net/httpclient/ShortResponseBody.java
  137. 0 test/jdk/jdk/jfr/event/gc/collection/{TestSystemGc.java → TestSystemGC.java}
  138. +11 −1 test/jdk/sun/security/krb5/config/native/TestDynamicStore.java
  139. +3 −1 test/jdk/sun/security/krb5/config/native/libTestDynamicStore.m
  140. +69 −29 test/jdk/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java
  141. +40 −2 test/langtools/tools/javac/patterns/Guards.java
  142. +12 −0 test/langtools/tools/javac/patterns/SwitchErrors.java
  143. +3 −1 test/langtools/tools/javac/patterns/SwitchErrors.out
  144. +26 −1 test/langtools/tools/javac/patterns/Switches.java
  145. +21 −1 test/langtools/tools/javac/switchexpr/ExpressionSwitch.java
@@ -25,47 +25,27 @@
# Shell script for generating an IDEA project from a given list of modules

usage() {
echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-o|--output <path>] [modules...]"
echo " -h | --help"
echo " -q | --quiet
No stdout output"
echo " -a | --absolute-paths
Use absolute paths to this jdk, so that generated .idea
project files can be moved independently of jdk sources"
echo " -o | --output <path>
Where .idea directory with project files will be generated
(e.g. using '-o .' will place project files in './.idea')
Default: $TOPLEVEL_DIR"
echo " [modules...]
Generate project modules for specific java modules
(e.g. 'java.base java.desktop')
Default: all existing modules (java.* and jdk.*)"
echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [modules]+"
exit 1
}

SCRIPT_DIR=`dirname $0`
#assume TOP is the dir from which the script has been called
TOP=`pwd`
cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
cd .. ; TOPLEVEL_DIR=`pwd`
cd $TOP;

IDEA_OUTPUT=$TOPLEVEL_DIR/.idea
VERBOSE=true
ABSOLUTE_PATHS=false
IDEA_OUTPUT=$TOP/.idea
VERBOSE="false"
while [ $# -gt 0 ]
do
case $1 in
-h | --help )
usage
;;

-q | --quiet )
VERBOSE=false
;;

-a | --absolute-paths )
ABSOLUTE_PATHS=true
-v | --vebose )
VERBOSE="true"
;;

-o | --output )
@@ -86,13 +66,18 @@ done

mkdir -p $IDEA_OUTPUT || exit 1
cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
cd ..; IDEA_OUTPUT_PARENT=`pwd`

MAKE_DIR="$TOPLEVEL_DIR/make"
if [ "x$TOPLEVEL_DIR" = "x" ] ; then
cd $SCRIPT_DIR/..
TOPLEVEL_DIR=`pwd`
cd $IDEA_OUTPUT
fi

MAKE_DIR="$SCRIPT_DIR/../make"
IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
IDEA_TEMPLATE="$IDEA_MAKE/template"

cp -rn "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"

#override template
if [ -d "$TEMPLATES_OVERRIDE" ] ; then
@@ -101,31 +86,31 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
done
fi

if [ "$VERBOSE" = true ] ; then
echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
if [ "$VERBOSE" = "true" ] ; then
echo "output dir: $IDEA_OUTPUT"
echo "idea template dir: $IDEA_TEMPLATE"
fi

cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I "$TOPLEVEL_DIR" idea \
MAKEOVERRIDES= IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" OUT="$IDEA_OUTPUT/env.cfg" MODULES="$*" || exit 1
cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" || exit 1
cd $SCRIPT_DIR

. $IDEA_OUTPUT/env.cfg

# Expect MODULES, MODULE_NAMES, RELATIVE_PROJECT_DIR, RELATIVE_BUILD_DIR to be set
if [ "xMODULES" = "x" ] ; then
echo "FATAL: MODULES is empty" >&2; exit 1
# Expect MODULE_ROOTS, MODULE_NAMES, BOOT_JDK & SPEC to be set
if [ "x$MODULE_ROOTS" = "x" ] ; then
echo "FATAL: MODULE_ROOTS is empty" >&2; exit 1
fi

if [ "x$MODULE_NAMES" = "x" ] ; then
echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
fi

if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
if [ "x$BOOT_JDK" = "x" ] ; then
echo "FATAL: BOOT_JDK is empty" >&2; exit 1
fi

if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
if [ "x$SPEC" = "x" ] ; then
echo "FATAL: SPEC is empty" >&2; exit 1
fi

if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
@@ -136,29 +121,6 @@ if [ -d "$TOPLEVEL_DIR/.git" ] ; then
VCS_TYPE="Git"
fi

if [ "$ABSOLUTE_PATHS" = true ] ; then
if [ "x$PATHTOOL" != "x" ]; then
PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
else
PROJECT_DIR="$TOPLEVEL_DIR"
fi
MODULE_DIR="$PROJECT_DIR"
cd "$TOPLEVEL_DIR" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
else
if [ "$RELATIVE_PROJECT_DIR" = "." ] ; then
PROJECT_DIR=""
else
PROJECT_DIR="/$RELATIVE_PROJECT_DIR"
fi
MODULE_DIR="\$MODULE_DIR\$$PROJECT_DIR"
PROJECT_DIR="\$PROJECT_DIR\$$PROJECT_DIR"
BUILD_DIR="\$PROJECT_DIR\$/$RELATIVE_BUILD_DIR"
fi
if [ "$VERBOSE" = true ] ; then
echo "Project root: $PROJECT_DIR"
echo "Generating IDEA project files..."
fi

### Replace template variables

NUM_REPLACEMENTS=0
@@ -182,82 +144,105 @@ add_replacement() {
eval TO$NUM_REPLACEMENTS='$2'
}

add_replacement "###PROJECT_DIR###" "$PROJECT_DIR"
add_replacement "###MODULE_DIR###" "$MODULE_DIR"
add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
add_replacement "###VCS_TYPE###" "$VCS_TYPE"
add_replacement "###BUILD_DIR###" "$BUILD_DIR"
if [ "x$PATHTOOL" != "x" ]; then
add_replacement "###BASH_RUNNER_PREFIX###" "\$PROJECT_DIR\$/.idea/bash.bat"
else
add_replacement "###BASH_RUNNER_PREFIX###" ""
fi
if [ "x$PATHTOOL" != "x" ]; then
SPEC_DIR=`dirname $SPEC`
if [ "x$CYGPATH" != "x" ]; then
add_replacement "###BUILD_DIR###" "`cygpath -am $SPEC_DIR`"
add_replacement "###IMAGES_DIR###" "`cygpath -am $SPEC_DIR`/images/jdk"
add_replacement "###ROOT_DIR###" "`cygpath -am $TOPLEVEL_DIR`"
add_replacement "###IDEA_DIR###" "`cygpath -am $IDEA_OUTPUT`"
if [ "x$JT_HOME" = "x" ]; then
add_replacement "###JTREG_HOME###" ""
else
add_replacement "###JTREG_HOME###" "`cygpath -am $JT_HOME`"
fi
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
add_replacement "###IMAGES_DIR###" "`wslpath -am $SPEC_DIR`/images/jdk"
add_replacement "###ROOT_DIR###" "`wslpath -am $TOPLEVEL_DIR`"
add_replacement "###IDEA_DIR###" "`wslpath -am $IDEA_OUTPUT`"
if [ "x$JT_HOME" = "x" ]; then
add_replacement "###JTREG_HOME###" ""
else
add_replacement "###JTREG_HOME###" "`$PATHTOOL -am $JT_HOME`"
add_replacement "###JTREG_HOME###" "`wslpath -am $JT_HOME`"
fi
else
add_replacement "###BUILD_DIR###" "$SPEC_DIR"
add_replacement "###JTREG_HOME###" "$JT_HOME"
add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
fi

MODULE_IMLS=""
TEST_MODULE_DEPENDENCIES=""
for module in $MODULE_NAMES; do
MODULE_IMLS="$MODULE_IMLS<module fileurl=\"file://\$PROJECT_DIR$/.idea/$module.iml\" filepath=\"\$PROJECT_DIR$/.idea/$module.iml\" /> "
TEST_MODULE_DEPENDENCIES="$TEST_MODULE_DEPENDENCIES<orderEntry type=\"module\" module-name=\"$module\" scope=\"TEST\" /> "
SOURCE_PREFIX="<sourceFolder url=\"file://"
SOURCE_POSTFIX="\" isTestSource=\"false\" />"

for root in $MODULE_ROOTS; do
if [ "x$CYGPATH" != "x" ]; then
root=`cygpath -am $root`
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
root=`wslpath -am $root`
fi

VM_CI="jdk.internal.vm.ci/share/classes"
VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
for subdir in "$root"/*; do
if [ -d "$subdir" ]; then
SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
fi
done
else
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
fi
done
add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"

add_replacement "###SOURCE_ROOTS###" "$SOURCES"

replace_template_dir "$IDEA_OUTPUT"

### Generate module project files

if [ "$VERBOSE" = true ] ; then
echo "Generating project modules:"
fi
(
DEFAULT_IFS="$IFS"
IFS='#'
for value in $MODULES; do
(
eval "$value"
if [ "$VERBOSE" = true ] ; then
echo " $module"
fi
add_replacement "###MODULE_CONTENT###" "src/$module"
SOURCE_DIRS=""
IFS=' '
for dir in $moduleSrcDirs; do
case $dir in # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
"src/"*) SOURCE_DIRS="$SOURCE_DIRS<sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" /> "
esac
done
add_replacement "###SOURCE_DIRS###" "$SOURCE_DIRS"
DEPENDENCIES=""
for dep in $moduleDependencies; do
case $MODULE_NAMES in # Exclude skipped modules from dependencies
*"$dep"*) DEPENDENCIES="$DEPENDENCIES<orderEntry type=\"module\" module-name=\"$dep\" /> "
esac
done
add_replacement "###DEPENDENCIES###" "$DEPENDENCIES"
cp "$IDEA_OUTPUT/module.iml" "$IDEA_OUTPUT/$module.iml"
IFS="$DEFAULT_IFS"
replace_template_file "$IDEA_OUTPUT/$module.iml"
)
done
)
rm "$IDEA_OUTPUT/module.iml"

### Create shell script runner for Windows

if [ "x$PATHTOOL" != "x" ]; then
echo "@echo off" > "$IDEA_OUTPUT/bash.bat"
if [ "x$WSL_DISTRO_NAME" != "x" ] ; then
echo "wsl -d $WSL_DISTRO_NAME --cd \"%cd%\" -e %*" >> "$IDEA_OUTPUT/bash.bat"
else
echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
fi
### Compile the custom Logger

CLASSES=$IDEA_OUTPUT/classes

if [ "x$ANT_HOME" = "x" ] ; then
# try some common locations, before giving up
if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
ANT_HOME="/usr/share/ant"
elif [ -f "/usr/local/Cellar/ant/1.9.4/libexec/lib/ant.jar" ] ; then
ANT_HOME="/usr/local/Cellar/ant/1.9.4/libexec"
else
echo "FATAL: cannot find ant. Try setting ANT_HOME." >&2; exit 1
fi
fi
CP=$ANT_HOME/lib/ant.jar
rm -rf $CLASSES; mkdir $CLASSES

if [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
JAVAC_CLASSES=`cygpath -am $CLASSES`
JAVAC_CP=`cygpath -am $CP`
JAVAC=javac
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
ANT_TEMP=`mktemp -d -p ./`
cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
JAVAC_CP=$ANT_TEMP/ant.jar
JAVAC=javac.exe
else
JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
JAVAC_CLASSES=$CLASSES
JAVAC_CP=$CP
JAVAC=javac
fi

$BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE

if [ "x$WSL_DISTRO_NAME" != "x" ]; then
rm -rf $ANT_TEMP
fi
@@ -542,6 +542,9 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
if ! JVM_FEATURES_IS_ACTIVE(jvmci); then
INCLUDE_JVMCI="false"
fi
if JVM_FEATURES_IS_ACTIVE(compiler2); then
INCLUDE_COMPILER2="true"
fi
# Verify that we have at least one gc selected (i.e., feature named "*gc").
if ! JVM_FEATURES_IS_ACTIVE(.*gc); then
@@ -565,6 +568,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
# missing any of them.
ENABLE_CDS="true"
INCLUDE_JVMCI="true"
INCLUDE_COMPILER2="false"
for variant in $JVM_VARIANTS; do
# Figure out if any features are unavailable, or should be filtered out
@@ -601,5 +605,6 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
AC_SUBST(JVM_FEATURES_custom)
AC_SUBST(INCLUDE_JVMCI)
AC_SUBST(INCLUDE_COMPILER2)
])
@@ -853,6 +853,7 @@ PNG_CFLAGS:=@PNG_CFLAGS@

INCLUDE_SA=@INCLUDE_SA@
INCLUDE_JVMCI=@INCLUDE_JVMCI@
INCLUDE_COMPILER2=@INCLUDE_COMPILER2@

OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
OS_VERSION_MINOR:=@OS_VERSION_MINOR@

0 comments on commit 85af6b5

Please sign in to comment.