--- a/make/autoconf/flags-cflags.m4 Sat Sep 15 14:03:07 2018 -0700
+++ b/make/autoconf/flags-cflags.m4 Mon Sep 17 09:36:33 2018 -0700
@@ -373,6 +373,20 @@
FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
+ # Check that the compiler supports -ffp-contract=off flag
+ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
+ # otherwise.
+ # These flags are required for GCC-based builds of
+ # fdlibm with optimization without losing precision.
+ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+ FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
+ IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
+ IF_FALSE: [FDLIBM_CFLAGS=""])
+ fi
+ AC_SUBST(FDLIBM_CFLAGS)
+
# Tests are only ever compiled for TARGET
CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
--- a/make/autoconf/spec.gmk.in Sat Sep 15 14:03:07 2018 -0700
+++ b/make/autoconf/spec.gmk.in Mon Sep 17 09:36:33 2018 -0700
@@ -450,6 +450,7 @@
LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
+FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
JVM_CFLAGS := @JVM_CFLAGS@
JVM_LDFLAGS := @JVM_LDFLAGS@
JVM_ASFLAGS := @JVM_ASFLAGS@
--- a/make/copy/Copy-java.base.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/copy/Copy-java.base.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
################################################################################
-ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),)
+ifeq ($(OPENJDK_TARGET_OS), aix)
TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
--- a/make/gensrc/GensrcCLDR.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/gensrc/GensrcCLDR.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -37,9 +37,17 @@
ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
TZDATA_DIR := $(TOPDIR)/make/data/tzdata
-$(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
- $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
- $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
+# tzmappings generation for Windows.
+# Since the rule is shared with CLDR_BASEMETAINFO_FILE target, note that
+# just removing the target tzmappings will not recreate the tzmappings file.
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ CLDR_WINTZMAPPINGS := $(GENSRC_BASEDIR)/windows/conf/tzmappings
+ $(CLDR_WINTZMAPPINGS): $(CLDR_BASEMETAINFO_FILE)
+endif
+
+$(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/dtd/*.dtd) \
+ $(wildcard $(CLDRSRCDIR)/main/en*.xml) \
+ $(wildcard $(CLDRSRCDIR)/supplemental/*.xml) \
$(ZONENAME_TEMPLATE) \
$(BUILD_TOOLS_JDK)
$(MKDIR) -p $(GENSRC_BASEDIR)
@@ -50,14 +58,14 @@
-zntempfile $(ZONENAME_TEMPLATE) \
-tzdatadir $(TZDATA_DIR)
-$(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
- $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
- $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
+$(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/dtd/*.dtd) \
+ $(wildcard $(CLDRSRCDIR)/main/*.xml) \
+ $(wildcard $(CLDRSRCDIR)/supplemental/*.xml) \
$(BUILD_TOOLS_JDK)
$(MKDIR) -p $(GENSRC_DIR)
$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
-baselocales $(CLDR_BASE_LOCALES) \
-o $(GENSRC_DIR)
-GENSRC_JAVA_BASE += $(CLDR_BASEMETAINFO_FILE)
+GENSRC_JAVA_BASE += $(CLDR_BASEMETAINFO_FILE) $(CLDR_WINTZMAPPINGS)
GENSRC_JDK_LOCALEDATA += $(CLDR_METAINFO_FILE)
--- a/make/hotspot/lib/CompileDtraceLibraries.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/hotspot/lib/CompileDtraceLibraries.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -25,6 +25,10 @@
ifeq ($(call check-jvm-feature, dtrace), true)
ifeq ($(OPENJDK_TARGET_OS), solaris)
+ JNI_INCLUDE_FLAGS := \
+ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
+ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
+ #
############################################################################
# Build the stand-alone dtrace libraries.
@@ -34,10 +38,9 @@
NAME := jvm_dtrace, \
OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \
- CFLAGS := -m64 -G -mt -KPIC, \
+ CFLAGS := $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \
LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
LIBS := $(LIBDL) -lthread -ldoor, \
- MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_dtrace/mapfile-vers, \
OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \
))
@@ -48,9 +51,8 @@
NAME := jvm_db, \
OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \
- CFLAGS := -I$(DTRACE_GENSRC_DIR) -m64 -G -mt -KPIC, \
+ CFLAGS := -I$(DTRACE_GENSRC_DIR) $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \
LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
- MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_db/mapfile-vers, \
OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \
))
--- a/make/hotspot/lib/JvmOverrideFiles.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -30,7 +30,7 @@
# status for individual files on specific platforms.
ifeq ($(TOOLCHAIN_TYPE), gcc)
- BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
+ BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java Sat Sep 15 14:03:07 2018 -0700
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java Mon Sep 17 09:36:33 2018 -0700
@@ -69,6 +69,7 @@
private static String METAZONES_SOURCE_FILE;
private static String LIKELYSUBTAGS_SOURCE_FILE;
private static String TIMEZONE_SOURCE_FILE;
+ private static String WINZONES_SOURCE_FILE;
static String DESTINATION_DIR = "build/gensrc";
static final String LOCALE_NAME_PREFIX = "locale.displayname.";
@@ -91,6 +92,7 @@
private static SupplementDataParseHandler handlerSuppl;
private static LikelySubtagsParseHandler handlerLikelySubtags;
+ private static WinZonesParseHandler handlerWinZones;
static SupplementalMetadataParseHandler handlerSupplMeta;
static NumberingSystemsParseHandler handlerNumbering;
static MetaZonesParseHandler handlerMetaZones;
@@ -241,6 +243,7 @@
METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
TIMEZONE_SOURCE_FILE = CLDR_BASE + "/bcp47/timezone.xml";
SPPL_META_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalMetadata.xml";
+ WINZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/windowsZones.xml";
if (BASE_LOCALES.isEmpty()) {
setupBaseLocales("en-US");
@@ -255,9 +258,12 @@
List<Bundle> bundles = readBundleList();
convertBundles(bundles);
- // Generate java.time.format.ZoneName.java
if (isBaseModule) {
+ // Generate java.time.format.ZoneName.java
generateZoneName();
+
+ // Generate Windows tzmappings
+ generateWindowsTZMappings();
}
}
@@ -432,6 +438,10 @@
// Currently interested in deprecated time zone ids and language aliases.
handlerSupplMeta = new SupplementalMetadataParseHandler();
parseLDMLFile(new File(SPPL_META_SOURCE_FILE), handlerSupplMeta);
+
+ // Parse windowsZones
+ handlerWinZones = new WinZonesParseHandler();
+ parseLDMLFile(new File(WINZONES_SOURCE_FILE), handlerWinZones);
}
// Parsers for data in "bcp47" directory
@@ -1088,4 +1098,42 @@
throw new UncheckedIOException(e);
}
}
+
+ // Generate tzmappings for Windows. The format is:
+ //
+ // (Windows Zone Name):(REGION):(Java TZID)
+ //
+ // where:
+ // Windows Zone Name: arbitrary time zone name string used in Windows
+ // REGION: ISO3166 or UN M.49 code
+ // Java TZID: Java's time zone ID
+ //
+ // Note: the entries are alphabetically sorted, *except* the "world" region
+ // code, i.e., "001". It should be the last entry for the same windows time
+ // zone name entries. (cf. TimeZone_md.c)
+ private static void generateWindowsTZMappings() throws Exception {
+ Files.createDirectories(Paths.get(DESTINATION_DIR, "windows", "conf"));
+ Files.write(Paths.get(DESTINATION_DIR, "windows", "conf", "tzmappings"),
+ handlerWinZones.keySet().stream()
+ .map(k -> k + ":" + handlerWinZones.get(k) + ":")
+ .sorted(new Comparator<String>() {
+ public int compare(String t1, String t2) {
+ String[] s1 = t1.split(":");
+ String[] s2 = t2.split(":");
+ if (s1[0].equals(s2[0])) {
+ if (s1[1].equals("001")) {
+ return 1;
+ } else if (s2[1].equals("001")) {
+ return -1;
+ } else {
+ return s1[1].compareTo(s2[1]);
+ }
+ } else {
+ return s1[0].compareTo(s2[0]);
+ }
+ }
+ })
+ .collect(Collectors.toList()),
+ StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/jdk/src/classes/build/tools/cldrconverter/WinZonesParseHandler.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.cldrconverter;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Handles parsing of files in Locale Data Markup Language for
+ * windowsZones.xml
+ */
+
+class WinZonesParseHandler extends AbstractLDMLHandler<Object> {
+ @Override
+ public InputSource resolveEntity(String publicID, String systemID) throws IOException, SAXException {
+ // avoid HTTP traffic to unicode.org
+ if (systemID.startsWith(CLDRConverter.SPPL_LDML_DTD_SYSTEM_ID)) {
+ return new InputSource((new File(CLDRConverter.LOCAL_SPPL_LDML_DTD)).toURI().toString());
+ }
+ return null;
+ }
+
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ switch (qName) {
+ case "mapZone":
+ String zoneName = attributes.getValue("other");
+ String territory = attributes.getValue("territory");
+ String javatz = attributes.getValue("type").replaceFirst("\\s.*", "");
+ put(zoneName + ":" + territory, javatz);
+ pushIgnoredContainer(qName);
+ break;
+ default:
+ // treat anything else as a container
+ pushContainer(qName, attributes);
+ break;
+ }
+ }
+}
--- a/make/langtools/tools/propertiesparser/PropertiesParser.java Sat Sep 15 14:03:07 2018 -0700
+++ b/make/langtools/tools/propertiesparser/PropertiesParser.java Mon Sep 17 09:36:33 2018 -0700
@@ -30,7 +30,7 @@
import java.io.File;
import java.io.PrintStream;
-import java.util.HashMap;
+import java.util.TreeMap;
import java.util.Map;
/** Translates a .properties file into a .java file containing an enum-like Java class
@@ -96,12 +96,13 @@
}
private Map<String, String> parseOptions(String args[]) {
- Map<String, String> optionsMap = new HashMap<>(args.length);
+ /* Use TreeMap to guarantee stable forEach iteration */
+ Map<String, String> optionsMap = new TreeMap<>();
for ( int i = 0; i < args.length ; i++ ) {
if ( "-compile".equals(args[i]) && i+2 < args.length ) {
optionsMap.put(args[++i], args[++i]);
} else {
- return new HashMap<>();
+ return new TreeMap<>();
}
}
return optionsMap;
--- a/make/lib/CoreLibraries.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/lib/CoreLibraries.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -39,20 +39,15 @@
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
endif
-ifeq ($(OPENJDK_TARGET_OS), linux)
- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
- else ifeq ($(OPENJDK_TARGET_CPU), s390x)
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
- endif
+# If FDLIBM_CFLAGS is non-empty we know that we can optimize
+# fdlibm when adding those extra C flags. Currently GCC,
+# and clang only.
+ifneq ($(FDLIBM_CFLAGS), )
+ BUILD_LIBFDLIBM_OPTIMIZATION := LOW
endif
LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
+LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
ifneq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
@@ -64,10 +59,6 @@
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
CFLAGS_windows_debug := -DLOGGING, \
CFLAGS_aix := -qfloat=nomaf, \
- CFLAGS_linux_ppc64 := -ffp-contract=off, \
- CFLAGS_linux_ppc64le := -ffp-contract=off, \
- CFLAGS_linux_s390x := -ffp-contract=off, \
- CFLAGS_linux_aarch64 := -ffp-contract=off, \
DISABLED_WARNINGS_gcc := sign-compare misleading-indentation array-bounds, \
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
ARFLAGS := $(ARFLAGS), \
--- a/make/lib/Lib-java.base.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/lib/Lib-java.base.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -195,3 +195,14 @@
TARGETS += $(JAVA_BASE_EXPORT_SYMBOL_FILE)
endif
+
+################################################################################
+# Copy tzmappings file for Windows
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupCopyFiles, COPY_TZMAPPINGS, \
+ FILES := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/windows/conf/tzmappings, \
+ DEST := $(call FindLibDirForModule, $(MODULE)), \
+ ))
+ TARGETS += $(COPY_TZMAPPINGS)
+endif
--- a/make/lib/Lib-jdk.hotspot.agent.gmk Sat Sep 15 14:03:07 2018 -0700
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk Mon Sep 17 09:36:33 2018 -0700
@@ -52,7 +52,7 @@
$(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
NAME := saproc, \
- OPTIMIZATION := NONE, \
+ OPTIMIZATION := HIGH, \
DISABLED_WARNINGS_microsoft := 4267, \
DISABLED_WARNINGS_gcc := sign-compare, \
DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
--- a/make/mapfiles/libjsound/mapfile-vers Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_com_sun_media_sound_DirectAudioDevice_nAvailable;
- Java_com_sun_media_sound_DirectAudioDevice_nClose;
- Java_com_sun_media_sound_DirectAudioDevice_nFlush;
- Java_com_sun_media_sound_DirectAudioDevice_nGetBufferSize;
- Java_com_sun_media_sound_DirectAudioDevice_nGetBytePosition;
- Java_com_sun_media_sound_DirectAudioDevice_nGetFormats;
- Java_com_sun_media_sound_DirectAudioDevice_nIsStillDraining;
- Java_com_sun_media_sound_DirectAudioDevice_nOpen;
- Java_com_sun_media_sound_DirectAudioDevice_nRead;
- Java_com_sun_media_sound_DirectAudioDevice_nRequiresServicing;
- Java_com_sun_media_sound_DirectAudioDevice_nService;
- Java_com_sun_media_sound_DirectAudioDevice_nSetBytePosition;
- Java_com_sun_media_sound_DirectAudioDevice_nStart;
- Java_com_sun_media_sound_DirectAudioDevice_nStop;
- Java_com_sun_media_sound_DirectAudioDevice_nWrite;
- Java_com_sun_media_sound_DirectAudioDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_DirectAudioDeviceProvider_nNewDirectAudioDeviceInfo;
- Java_com_sun_media_sound_MidiInDevice_nClose;
- Java_com_sun_media_sound_MidiInDevice_nGetMessages;
- Java_com_sun_media_sound_MidiInDevice_nGetTimeStamp;
- Java_com_sun_media_sound_MidiInDevice_nOpen;
- Java_com_sun_media_sound_MidiInDevice_nStart;
- Java_com_sun_media_sound_MidiInDevice_nStop;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetDescription;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetName;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetVendor;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetVersion;
- Java_com_sun_media_sound_MidiOutDevice_nClose;
- Java_com_sun_media_sound_MidiOutDevice_nGetTimeStamp;
- Java_com_sun_media_sound_MidiOutDevice_nOpen;
- Java_com_sun_media_sound_MidiOutDevice_nSendLongMessage;
- Java_com_sun_media_sound_MidiOutDevice_nSendShortMessage;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetDescription;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetName;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetVendor;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetVersion;
- Java_com_sun_media_sound_Platform_nIsBigEndian;
- Java_com_sun_media_sound_PortMixer_nClose;
- Java_com_sun_media_sound_PortMixer_nControlGetFloatValue;
- Java_com_sun_media_sound_PortMixer_nControlGetIntValue;
- Java_com_sun_media_sound_PortMixer_nControlSetFloatValue;
- Java_com_sun_media_sound_PortMixer_nControlSetIntValue;
- Java_com_sun_media_sound_PortMixer_nGetControls;
- Java_com_sun_media_sound_PortMixer_nGetPortCount;
- Java_com_sun_media_sound_PortMixer_nGetPortName;
- Java_com_sun_media_sound_PortMixer_nGetPortType;
- Java_com_sun_media_sound_PortMixer_nOpen;
- Java_com_sun_media_sound_PortMixerProvider_nGetNumDevices;
- Java_com_sun_media_sound_PortMixerProvider_nNewPortMixerInfo;
- local:
- *;
-};
--- a/make/mapfiles/libjvm_db/mapfile-vers Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-
-#
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Jagent_create;
- Jagent_destroy;
- Jframe_iter;
- #Jget_vframe;
- #Jlookup_by_regs;
- local:
- *;
-};
--- a/make/mapfiles/libjvm_dtrace/mapfile-vers Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-
-#
-# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# Define library interface for JVM-DTrace interface
-
-SUNWprivate_1.1 {
- global:
- jvm_attach;
- jvm_get_last_error;
- jvm_enable_dtprobes;
- jvm_detach;
- local:
- *;
-};
--- a/make/scripts/compare_exceptions.sh.incl Sat Sep 15 14:03:07 2018 -0700
+++ b/make/scripts/compare_exceptions.sh.incl Mon Sep 17 09:36:33 2018 -0700
@@ -350,13 +350,11 @@
MAX_KNOWN_DIS_DIFF_SIZE="3000"
- # On slowdebug the disassembly can differ randomly.
- if [ "$DEBUG_LEVEL" = "slowdebug" ]; then
- ACCEPTED_DIS_DIFF="
- ./lib/libfontmanager.so
- ./lib/server/libjvm.so
- "
- fi
+ ACCEPTED_DIS_DIFF="
+ ./lib/libfontmanager.so
+ ./lib/libsaproc.so
+ ./lib/server/libjvm.so
+ "
SKIP_FULLDUMP_DIFF="true"
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1569,7 +1569,6 @@
}
Register newval = as_reg(op->new_value());
Register cmpval = as_reg(op->cmp_value());
- Label succeed, fail, around;
if (op->code() == lir_cas_obj) {
if (UseCompressedOops) {
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -64,7 +64,7 @@
const int aligned_mask = BytesPerWord -1;
const int hdr_offset = oopDesc::mark_offset_in_bytes();
assert(hdr != obj && hdr != disp_hdr && obj != disp_hdr, "registers must be different");
- Label done, fail;
+ Label done;
int null_check_offset = -1;
verify_oop(obj);
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -615,7 +615,7 @@
// Runtime will return true if the nmethod has been deoptimized during
// the patching process. In that case we must do a deopt reexecute instead.
- Label reexecuteEntry, cont;
+ Label cont;
__ cbz(r0, cont); // have we deoptimized?
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -5431,7 +5431,7 @@
BLOCK_COMMENT("zero_words {");
cmp(cnt, (u1)zero_words_block_size);
- Label around, done, done16;
+ Label around;
br(LO, around);
{
RuntimeAddress zero_blocks = RuntimeAddress(StubRoutines::aarch64::zero_blocks());
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1004,7 +1004,7 @@
br(LT, Z_IS_LESS_THAN_TWO24B);
fmuld(v1, v18, v17); // twon24*z
frintzd(v1, v1); // v1 = (double)(int)(v1)
- fmaddd(v2, v10, v1, v18);
+ fmsubd(v2, v10, v1, v18);
fcvtzdw(tmp3, v1); // (int)fw
fcvtzdw(tmp2, v2); // double to int
strw(tmp2, Address(iqBase, jz, Address::lsl(2)));
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -634,7 +634,7 @@
// r11 < MacroAssembler::zero_words_block_size.
address generate_zero_blocks() {
- Label store_pair, loop_store_pair, done;
+ Label done;
Label base_aligned;
Register base = r10, cnt = r11;
@@ -1039,7 +1039,7 @@
int direction = is_backwards ? -1 : 1;
int unit = wordSize * direction;
- Label Lpair, Lword, Lint, Lshort, Lbyte;
+ Label Lword, Lint, Lshort, Lbyte;
assert(granularity
&& granularity <= sizeof (jlong), "Impossible granularity in copy_memory_small");
@@ -1096,7 +1096,7 @@
// <= 96 bytes do inline. Direction doesn't matter because we always
// load all the data before writing anything
- Label copy4, copy8, copy16, copy32, copy80, copy128, copy_big, finish;
+ Label copy4, copy8, copy16, copy32, copy80, copy_big, finish;
const Register t2 = r5, t3 = r6, t4 = r7, t5 = r8;
const Register t6 = r9, t7 = r10, t8 = r11, t9 = r12;
const Register send = r17, dend = r18;
@@ -1966,7 +1966,7 @@
address int_copy_entry, address oop_copy_entry,
address long_copy_entry, address checkcast_copy_entry) {
- Label L_failed, L_failed_0, L_objArray;
+ Label L_failed, L_objArray;
Label L_copy_bytes, L_copy_shorts, L_copy_ints, L_copy_longs;
// Input registers
@@ -4366,7 +4366,7 @@
Register ch1 = rscratch1, ch2 = rscratch2, first = tmp3;
__ push(spilled_regs, sp);
- Label L_LOOP, L_LOOP_PROCEED, L_SMALL, L_HAS_ZERO, L_SMALL_MATCH_LOOP,
+ Label L_LOOP, L_LOOP_PROCEED, L_SMALL, L_HAS_ZERO,
L_HAS_ZERO_LOOP, L_CMP_LOOP, L_CMP_LOOP_NOMATCH, L_SMALL_PROCEED,
L_SMALL_HAS_ZERO_LOOP, L_SMALL_CMP_LOOP_NOMATCH, L_SMALL_CMP_LOOP,
L_POST_LOOP, L_CMP_LOOP_LAST_CMP, L_HAS_ZERO_LOOP_NOMATCH,
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1450,7 +1450,7 @@
// and result handler will pick it up
{
- Label no_oop, not_weak, store_result;
+ Label no_oop;
__ adr(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
__ cmp(t, result_handler);
__ br(Assembler::NE, no_oop);
--- a/src/hotspot/cpu/arm/arm.ad Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/arm/arm.ad Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -1639,7 +1639,7 @@
%}
enc_class enc_String_Equals(R0RegP str1, R1RegP str2, R2RegI cnt, iRegI result, iRegI tmp1, iRegI tmp2) %{
- Label Lword_loop, Lpost_word, Lchar, Lchar_loop, Ldone, Lequal;
+ Label Lchar, Lchar_loop, Ldone, Lequal;
MacroAssembler _masm(&cbuf);
Register str1_reg = $str1$$Register;
@@ -1701,7 +1701,7 @@
%}
enc_class enc_Array_Equals(R0RegP ary1, R1RegP ary2, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI result) %{
- Label Lvector, Ldone, Lloop, Lequal;
+ Label Ldone, Lloop, Lequal;
MacroAssembler _masm(&cbuf);
Register ary1_reg = $ary1$$Register;
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -370,7 +370,6 @@
}
assert(oopDesc::mark_offset_in_bytes() == 0, "Required by atomic instructions");
- Label retry;
// Load displaced header and object from the lock
ldr(hdr, Address(disp_hdr, mark_offset));
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -260,7 +260,7 @@
add(count_temp, count_temp, 1);
- Label L_loop, L_setnz_and_fail, L_fail;
+ Label L_loop, L_fail;
// Top of search loop
bind(L_loop);
--- a/src/hotspot/cpu/arm/methodHandles_arm.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/arm/methodHandles_arm.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -446,7 +446,6 @@
}
// given intf, index, and recv klass, dispatch to the implementation method
- Label L_no_such_interface;
__ lookup_interface_method(temp1_recv_klass, temp3_intf,
// note: next two args must be the same:
rbx_index, rbx_method,
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1566,7 +1566,7 @@
const Register disp_hdr = AARCH64_ONLY(R22) NOT_AARCH64(altFP_7_11);
const Register tmp = AARCH64_ONLY(R23) NOT_AARCH64(R8);
- Label slow_lock, slow_lock_biased, lock_done, fast_lock, leave;
+ Label slow_lock, slow_lock_biased, lock_done, fast_lock;
if (method->is_synchronized()) {
// The first argument is a handle to sync object (a class or an instance)
__ ldr(sync_obj, Address(R1));
@@ -1686,7 +1686,7 @@
__ b(reguard, eq);
__ bind(reguard_done);
- Label slow_unlock, unlock_done, retry;
+ Label slow_unlock, unlock_done;
if (method->is_synchronized()) {
__ ldr(sync_obj, Address(sync_handle));
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -2758,7 +2758,6 @@
Label L_doLast;
Label L_do44;
Label L_do52;
- Label L_do60;
Register from = R3_ARG1; // source array address
Register to = R4_ARG2; // destination array address
@@ -3296,8 +3295,8 @@
const Register cs = R27;
// Labels
- Label SKIP_LSHIFT, SKIP_DIAGONAL_SUM, SKIP_ADDONE, SKIP_MULADD, SKIP_LOOP_SQUARE;
- Label LOOP_LSHIFT, LOOP_DIAGONAL_SUM, LOOP_ADDONE, LOOP_MULADD, LOOP_SQUARE;
+ Label SKIP_LSHIFT, SKIP_DIAGONAL_SUM, SKIP_ADDONE, SKIP_LOOP_SQUARE;
+ Label LOOP_LSHIFT, LOOP_DIAGONAL_SUM, LOOP_ADDONE, LOOP_SQUARE;
// Save non-volatile regs (frameless).
int current_offs = -8;
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -3880,7 +3880,6 @@
void TemplateTable::arraylength() {
transition(atos, itos);
- Label LnoException;
__ verify_oop(R17_tos);
__ null_check_throw(R17_tos, arrayOopDesc::length_offset_in_bytes(), R11_scratch1);
__ lwa(R17_tos, arrayOopDesc::length_offset_in_bytes(), R17_tos);
@@ -4081,7 +4080,7 @@
found_same_obj = CCR1,
reached_limit = CCR6;
{
- Label Lloop, Lentry;
+ Label Lloop;
Register Rlimit = Rcurrent_monitor;
// Set up search loop - start with topmost monitor.
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -3079,7 +3079,7 @@
// Input registers must not overlap.
// Also check for R1 which is explicitely used here.
assert_different_registers(Z_R1, Rsubklass, Rsuperklass, Rarray_ptr, Rlength);
- NearLabel L_fallthrough, L_loop;
+ NearLabel L_fallthrough;
int label_nulls = 0;
if (L_success == NULL) { L_success = &L_fallthrough; label_nulls++; }
if (L_failure == NULL) { L_failure = &L_fallthrough; label_nulls++; }
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -285,11 +285,6 @@
// Just pop the topmost frame ...
//
- Label ret_is_object;
- Label ret_is_long;
- Label ret_is_float;
- Label ret_is_double;
-
// Restore frame pointer.
__ z_lg(r_entryframe_fp, _z_abi(callers_sp), Z_SP);
// Pop frame. Done here to minimize stalls.
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -3785,7 +3785,6 @@
Label slow_case;
Label done;
Label initialize_header;
- Label allocate_shared;
BLOCK_COMMENT("TemplateTable::_new {");
__ get_2_byte_integer_at_bcp(offset/*dest*/, 1, InterpreterMacroAssembler::Unsigned);
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -2648,8 +2648,6 @@
inc_counter((address) counters->total_entry_count_addr(), Rmark, Rscratch);
}
- Label Egress ;
-
// Aggressively avoid the Store-before-CAS penalty
// Defer the store into box->dhw until after the CAS
Label IsInflated, Recursive ;
@@ -4171,7 +4169,7 @@
Label L_main_loop_prologue;
Label L_fold_512b, L_fold_512b_loop, L_fold_128b;
Label L_fold_tail, L_fold_tail_loop;
- Label L_8byte_fold_loop, L_8byte_fold_check;
+ Label L_8byte_fold_check;
const Register tmp[CRC32_TMP_REG_NUM] = {L0, L1, L2, L3, L4, L5, L6, G1, I0, I1, I2, I3, I4, I5, I7, O4, O5, G3};
--- a/src/hotspot/cpu/sparc/vtableStubs_sparc.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/sparc/vtableStubs_sparc.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -166,7 +166,6 @@
Register G3_Klass = G3_scratch;
Register G5_icholder = G5; // Passed in as an argument
Register G4_interface = G4_scratch;
- Label search;
// Entry arguments:
// G5_interface: Interface
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1778,7 +1778,6 @@
__ bind(profile_cast_success);
__ mov_metadata(mdo, md->constant_encoding());
__ load_klass(recv, obj);
- Label update_done;
type_profile_helper(mdo, md, data, recv, success);
__ jmp(*success);
@@ -1861,7 +1860,6 @@
__ bind(profile_cast_success);
__ mov_metadata(mdo, md->constant_encoding());
__ load_klass(recv, value);
- Label update_done;
type_profile_helper(mdo, md, data, recv, &done);
__ jmpb(done);
@@ -3048,7 +3046,6 @@
// if we don't know anything, just go through the generic arraycopy
if (default_type == NULL) {
- Label done;
// save outgoing arguments on stack in case call to System.arraycopy is needed
// HACK ALERT. This code used to push the parameters in a hardwired fashion
// for interpreter calling conventions. Now we have to do it in new style conventions.
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -957,7 +957,7 @@
// Runtime will return true if the nmethod has been deoptimized during
// the patching process. In that case we must do a deopt reexecute instead.
- Label reexecuteEntry, cont;
+ Label cont;
__ testptr(rax, rax); // have we deoptimized?
__ jcc(Assembler::equal, cont); // no
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -170,7 +170,7 @@
void InterpreterMacroAssembler::profile_return_type(Register mdp, Register ret, Register tmp) {
assert_different_registers(mdp, ret, tmp, _bcp_register);
if (ProfileInterpreter && MethodData::profile_return()) {
- Label profile_continue, done;
+ Label profile_continue;
test_method_data_pointer(mdp, profile_continue);
@@ -204,7 +204,7 @@
void InterpreterMacroAssembler::profile_parameters_type(Register mdp, Register tmp1, Register tmp2) {
if (ProfileInterpreter && MethodData::profile_parameters()) {
- Label profile_continue, done;
+ Label profile_continue;
test_method_data_pointer(mdp, profile_continue);
@@ -1703,12 +1703,12 @@
bind(next_test);
if (test_for_null_also) {
- Label found_null;
// Failed the equality check on item[n]... Test for null.
testptr(reg2, reg2);
if (start_row == last_row) {
// The only thing left to do is handle the null case.
if (non_profiled_offset >= 0) {
+ Label found_null;
jccb(Assembler::zero, found_null);
// Item did not match any saved item and there is no empty row for it.
// Increment total counter to indicate polymorphic case.
@@ -1720,6 +1720,7 @@
}
break;
}
+ Label found_null;
// Since null is rare, make it be the branch-taken case.
jcc(Assembler::zero, found_null);
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -7982,7 +7982,7 @@
Register rtmp, XMMRegister xtmp) {
ShortBranchVerifier sbv(this);
assert_different_registers(to, value, count, rtmp);
- Label L_exit, L_skip_align1, L_skip_align2, L_fill_byte;
+ Label L_exit;
Label L_fill_2_bytes, L_fill_4_bytes;
int shift = -1;
@@ -8017,8 +8017,10 @@
cmpl(count, 2<<shift); // Short arrays (< 8 bytes) fill by element
jcc(Assembler::below, L_fill_4_bytes); // use unsigned cmp
if (!UseUnalignedLoadStores && !aligned && (t == T_BYTE || t == T_SHORT)) {
+ Label L_skip_align2;
// align source address at 4 bytes address boundary
if (t == T_BYTE) {
+ Label L_skip_align1;
// One byte misalignment happens only for byte arrays
testptr(to, 1);
jccb(Assembler::zero, L_skip_align1);
@@ -8183,6 +8185,7 @@
jccb(Assembler::zero, L_fill_2_bytes);
movl(Address(to, 0), value);
if (t == T_BYTE || t == T_SHORT) {
+ Label L_fill_byte;
addptr(to, 4);
BIND(L_fill_2_bytes);
// fill trailing 2 bytes
@@ -8246,7 +8249,7 @@
negptr(len);
if (UseSSE42Intrinsics || UseAVX >= 2) {
- Label L_chars_8_check, L_copy_8_chars, L_copy_8_chars_exit;
+ Label L_copy_8_chars, L_copy_8_chars_exit;
Label L_chars_16_check, L_copy_16_chars, L_copy_16_chars_exit;
if (UseAVX >= 2) {
@@ -8812,9 +8815,8 @@
void MacroAssembler::vectorized_mismatch(Register obja, Register objb, Register length, Register log2_array_indxscale,
Register result, Register tmp1, Register tmp2, XMMRegister rymm0, XMMRegister rymm1, XMMRegister rymm2){
assert(UseSSE42Intrinsics, "SSE4.2 must be enabled.");
- Label VECTOR64_LOOP, VECTOR64_TAIL, VECTOR64_NOT_EQUAL, VECTOR32_TAIL;
- Label VECTOR32_LOOP, VECTOR16_LOOP, VECTOR8_LOOP, VECTOR4_LOOP;
- Label VECTOR16_TAIL, VECTOR8_TAIL, VECTOR4_TAIL;
+ Label VECTOR16_LOOP, VECTOR8_LOOP, VECTOR4_LOOP;
+ Label VECTOR8_TAIL, VECTOR4_TAIL;
Label VECTOR32_NOT_EQUAL, VECTOR16_NOT_EQUAL, VECTOR8_NOT_EQUAL, VECTOR4_NOT_EQUAL;
Label SAME_TILL_END, DONE;
Label BYTES_LOOP, BYTES_TAIL, BYTES_NOT_EQUAL;
@@ -8827,6 +8829,8 @@
if ((UseAVX > 2) &&
VM_Version::supports_avx512vlbw()) {
+ Label VECTOR64_LOOP, VECTOR64_NOT_EQUAL, VECTOR32_TAIL;
+
set_vector_masking(); // opening of the stub context for programming mask registers
cmpq(length, 64);
jcc(Assembler::less, VECTOR32_TAIL);
@@ -8848,7 +8852,7 @@
testq(tmp1, tmp1);
jcc(Assembler::zero, SAME_TILL_END);
- bind(VECTOR64_TAIL);
+ //bind(VECTOR64_TAIL);
// AVX512 code to compare upto 63 byte vectors.
// Save k1
kmovql(k3, k1);
@@ -8881,6 +8885,7 @@
jcc(Assembler::less, VECTOR4_TAIL);
if (UseAVX >= 2) {
+ Label VECTOR16_TAIL, VECTOR32_LOOP;
cmpq(length, 16);
jcc(Assembler::equal, VECTOR16_LOOP);
@@ -9231,7 +9236,7 @@
*/
void MacroAssembler::square_to_len(Register x, Register len, Register z, Register zlen, Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5, Register rdxReg, Register raxReg) {
- Label L_second_loop, L_second_loop_exit, L_third_loop, L_third_loop_exit, fifth_loop, fifth_loop_exit, L_last_x, L_multiply;
+ Label L_second_loop, L_second_loop_exit, L_third_loop, L_third_loop_exit, L_last_x, L_multiply;
push(tmp1);
push(tmp2);
push(tmp3);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -185,7 +185,7 @@
Label L_2TAG_PACKET_0_0_1, L_2TAG_PACKET_1_0_1, L_2TAG_PACKET_2_0_1, L_2TAG_PACKET_3_0_1;
Label L_2TAG_PACKET_4_0_1, L_2TAG_PACKET_5_0_1, L_2TAG_PACKET_6_0_1, L_2TAG_PACKET_7_0_1;
Label L_2TAG_PACKET_8_0_1, L_2TAG_PACKET_9_0_1, L_2TAG_PACKET_10_0_1, L_2TAG_PACKET_11_0_1;
- Label L_2TAG_PACKET_12_0_1, L_2TAG_PACKET_13_0_1, B1_2, B1_3, B1_4, B1_5, start;
+ Label L_2TAG_PACKET_12_0_1, L_2TAG_PACKET_13_0_1, B1_2, B1_4, start;
assert_different_registers(r8, r9, r10, r11, eax, ecx, edx);
@@ -756,9 +756,7 @@
void MacroAssembler::fast_cos(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3, XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7, Register eax, Register ecx, Register edx, Register tmp) {
Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
- Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
- Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, L_2TAG_PACKET_10_0_2, L_2TAG_PACKET_11_0_2;
- Label L_2TAG_PACKET_12_0_2, L_2TAG_PACKET_13_0_2, B1_3, B1_5, start;
+ Label start;
assert_different_registers(tmp, eax, ecx, edx);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -483,7 +483,7 @@
Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, L_2TAG_PACKET_10_0_2, L_2TAG_PACKET_11_0_2;
- Label L_2TAG_PACKET_12_0_2, L_2TAG_PACKET_13_0_2, B1_3, B1_5, start;
+ Label L_2TAG_PACKET_12_0_2, start;
assert_different_registers(tmp, eax, ecx, edx);
jmp(start);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_log.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_log.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -186,7 +186,7 @@
Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
Label L_2TAG_PACKET_8_0_2;
- Label L_2TAG_PACKET_12_0_2, L_2TAG_PACKET_13_0_2, B1_3, B1_5, start;
+ Label B1_3, B1_5, start;
assert_different_registers(tmp1, tmp2, eax, ecx, edx);
jmp(start);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -198,7 +198,7 @@
void MacroAssembler::fast_log10(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3, XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7, Register eax, Register ecx, Register edx, Register r11) {
Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
- Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, B1_2, B1_3, B1_4, B1_5, start;
+ Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, B1_2, B1_3, B1_5, start;
assert_different_registers(r11, eax, ecx, edx);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -383,7 +383,7 @@
Label L_2TAG_PACKET_4_0_1, L_2TAG_PACKET_5_0_1, L_2TAG_PACKET_6_0_1, L_2TAG_PACKET_7_0_1;
Label L_2TAG_PACKET_8_0_1, L_2TAG_PACKET_9_0_1, L_2TAG_PACKET_10_0_1, L_2TAG_PACKET_11_0_1;
Label L_2TAG_PACKET_13_0_1, L_2TAG_PACKET_14_0_1;
- Label L_2TAG_PACKET_12_0_1, B1_1, B1_2, B1_4, start;
+ Label L_2TAG_PACKET_12_0_1, B1_4, start;
assert_different_registers(tmp1, tmp2, tmp3, tmp4, eax, ebx, ecx, edx);
address ONEHALF = StubRoutines::x86::_ONEHALF_addr();
@@ -1673,7 +1673,7 @@
Label B1_1, B1_2, B1_3, B1_4, B1_5, B1_6, B1_7, B1_8, B1_9, B1_10, B1_11, B1_12;
Label B1_13, B1_14, B1_15, B1_16, B1_17, B1_18, B1_19, B1_20, B1_21, B1_22, B1_23;
Label B1_24, B1_25, B1_26, B1_27, B1_28, B1_29, B1_30, B1_31, B1_32, B1_33, B1_34;
- Label B1_35, B1_36, B1_37, B1_38, B1_39, B1_40, B1_41, B1_42, B1_43, B1_44, B1_45, B1_46;
+ Label B1_35, B1_36, B1_37, B1_38, B1_39, B1_40, B1_41, B1_42, B1_43, B1_46;
assert_different_registers(ebx, eax, ecx, edx, esi, edi, ebp, esp);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -501,7 +501,7 @@
Label L_2TAG_PACKET_0_0_1, L_2TAG_PACKET_1_0_1, L_2TAG_PACKET_2_0_1, L_2TAG_PACKET_3_0_1;
Label L_2TAG_PACKET_4_0_1, L_2TAG_PACKET_5_0_1, L_2TAG_PACKET_6_0_1, L_2TAG_PACKET_7_0_1;
Label L_2TAG_PACKET_8_0_1, L_2TAG_PACKET_9_0_1, L_2TAG_PACKET_10_0_1, L_2TAG_PACKET_11_0_1;
- Label L_2TAG_PACKET_12_0_1, L_2TAG_PACKET_13_0_1, L_2TAG_PACKET_14_0_1, B1_2, B1_3, B1_4, B1_5, start;
+ Label L_2TAG_PACKET_12_0_1, L_2TAG_PACKET_13_0_1, L_2TAG_PACKET_14_0_1, B1_2, B1_4, start;
address ONEHALF = (address)_ONEHALF_tan;
address MUL16 = (address)_MUL16;
@@ -1089,7 +1089,7 @@
Label B1_1, B1_2, B1_3, B1_4, B1_5, B1_6, B1_7, B1_8, B1_9, B1_10, B1_11, B1_12;
Label B1_13, B1_14, B1_15, B1_16, B1_17, B1_18, B1_19, B1_20, B1_21, B1_22, B1_23;
Label B1_24, B1_25, B1_26, B1_27, B1_28, B1_29, B1_30, B1_31, B1_32, B1_33, B1_34;
- Label B1_35, B1_36, B1_37, B1_38, B1_39, B1_40, B1_41, B1_42, B1_43, B1_44, B1_45, B1_46;
+ Label B1_35, B1_36, B1_37, B1_38, B1_39, B1_40, B1_43;
assert_different_registers(ebx, eax, ecx, edx, esi, edi, ebp, esp);
@@ -1966,9 +1966,8 @@
void MacroAssembler::fast_tan(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3, XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7, Register eax, Register ecx, Register edx, Register tmp) {
Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
- Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
- Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, L_2TAG_PACKET_10_0_2, L_2TAG_PACKET_11_0_2;
- Label L_2TAG_PACKET_12_0_2, L_2TAG_PACKET_13_0_2, B1_3, B1_5, start;
+ Label L_2TAG_PACKET_4_0_2;
+ Label start;
assert_different_registers(tmp, eax, ecx, edx);
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -3492,8 +3492,13 @@
// No exception case
__ bind(noException);
- Label no_adjust, bail, no_prefix, not_special;
+ Label no_adjust;
+#ifdef ASSERT
+ Label bail;
+#endif
if (SafepointMechanism::uses_thread_local_poll() && !cause_return) {
+ Label no_prefix, not_special;
+
// If our stashed return pc was modified by the runtime we avoid touching it
__ cmpptr(rbx, Address(rbp, wordSize));
__ jccb(Assembler::notEqual, no_adjust);
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1906,7 +1906,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_bytes, L_copy_8_bytes, L_copy_2_bytes, L_exit;
+ Label L_copy_bytes, L_copy_8_bytes, L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register count = rdx; // elements count
@@ -3848,7 +3848,7 @@
Label L__incCounter[3][6]; //for 6 blocks
Label L__incCounter_single[3]; //for single block, key128, key192, key256
Label L_processTail_insr[3], L_processTail_4_insr[3], L_processTail_2_insr[3], L_processTail_1_insr[3], L_processTail_exit_insr[3];
- Label L_processTail_extr[3], L_processTail_4_extr[3], L_processTail_2_extr[3], L_processTail_1_extr[3], L_processTail_exit_extr[3];
+ Label L_processTail_4_extr[3], L_processTail_2_extr[3], L_processTail_1_extr[3], L_processTail_exit_extr[3];
Label L_exit;
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -1171,7 +1171,7 @@
// and result handler will pick it up
{
- Label no_oop, not_weak, store_result;
+ Label no_oop;
__ lea(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
__ cmpptr(t, Address(rbp, frame::interpreter_frame_result_handler_offset*wordSize));
__ jcc(Assembler::notEqual, no_oop);
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -2875,7 +2875,7 @@
const Address field(obj, off, Address::times_1, 0*wordSize);
- Label Done, notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj, notDouble;
+ Label Done, notByte, notBool, notInt, notShort, notChar, notLong, notFloat, notObj;
__ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
// Make sure we don't need to mask edx after the above shift
@@ -2981,6 +2981,7 @@
__ bind(notFloat);
#ifdef ASSERT
+ Label notDouble;
__ cmpl(flags, dtos);
__ jcc(Assembler::notEqual, notDouble);
#endif
@@ -3132,7 +3133,7 @@
NOT_LP64( const Address hi(obj, off, Address::times_1, 1*wordSize);)
Label notByte, notBool, notInt, notShort, notChar,
- notLong, notFloat, notObj, notDouble;
+ notLong, notFloat, notObj;
__ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
@@ -3286,6 +3287,7 @@
__ bind(notFloat);
#ifdef ASSERT
+ Label notDouble;
__ cmpl(flags, dtos);
__ jcc(Assembler::notEqual, notDouble);
#endif
--- a/src/hotspot/os/windows/include/jvm_md.h Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/os/windows/include/jvm_md.h Mon Sep 17 09:36:33 2018 -0700
@@ -63,7 +63,7 @@
#include <stddef.h> /* For uintptr_t */
#include <stdlib.h>
-#define JVM_MAXPATHLEN _MAX_PATH
+#define JVM_MAXPATHLEN 1024
#define JVM_R_OK 4
#define JVM_W_OK 2
--- a/src/hotspot/share/aot/aotCodeHeap.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -38,6 +38,7 @@
#include "oops/method.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/os.hpp"
+#include "runtime/safepointVerifiers.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/vm_operations.hpp"
@@ -298,15 +299,25 @@
void AOTCodeHeap::publish_aot(const methodHandle& mh, AOTMethodData* method_data, int code_id) {
// The method may be explicitly excluded by the user.
// Or Interpreter uses an intrinsic for this method.
- if (CompilerOracle::should_exclude(mh) || !AbstractInterpreter::can_be_compiled(mh)) {
+ // Or method has breakpoints.
+ if (CompilerOracle::should_exclude(mh) ||
+ !AbstractInterpreter::can_be_compiled(mh) ||
+ (mh->number_of_breakpoints() > 0)) {
return;
}
+ // Make sure no break points were set in the method in case of a safepoint
+ // in the following code until aot code is registered.
+ NoSafepointVerifier nsv;
address code = method_data->_code;
const char* name = method_data->_name;
aot_metadata* meta = method_data->_meta;
if (meta->scopes_pcs_begin() == meta->scopes_pcs_end()) {
+ // Switch off NoSafepointVerifier because log_info() may cause safepoint
+ // and it is fine because aot code will not be registered here.
+ PauseNoSafepointVerifier pnsv(&nsv);
+
// When the AOT compiler compiles something big we fail to generate metadata
// in CodeInstaller::gather_metadata. In that case the scopes_pcs_begin == scopes_pcs_end.
// In all successful cases we always have 2 entries of scope pcs.
@@ -343,6 +354,7 @@
#endif
Method::set_code(mh, aot);
if (PrintAOT || (PrintCompilation && PrintAOT)) {
+ PauseNoSafepointVerifier pnsv(&nsv); // aot code is registered already
aot->print_on(tty, NULL);
}
// Publish oop only after we are visible to CompiledMethodIterator
@@ -918,16 +930,6 @@
}
#endif
-void AOTCodeHeap::flush_evol_dependents_on(InstanceKlass* dependee) {
- for (int index = 0; index < _method_count; index++) {
- if (_code_to_aot[index]._state != in_use) {
- continue; // Skip uninitialized entries.
- }
- AOTCompiledMethod* aot = _code_to_aot[index]._aot;
- aot->flush_evol_dependents_on(dependee);
- }
-}
-
void AOTCodeHeap::metadata_do(void f(Metadata*)) {
for (int index = 0; index < _method_count; index++) {
if (_code_to_aot[index]._state != in_use) {
--- a/src/hotspot/share/aot/aotCodeHeap.hpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/aot/aotCodeHeap.hpp Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -283,8 +283,6 @@
DEBUG_ONLY( int verify_icholder_relocations(); )
- void flush_evol_dependents_on(InstanceKlass* dependee);
-
void alive_methods_do(void f(CompiledMethod* nm));
#ifndef PRODUCT
--- a/src/hotspot/share/aot/aotCompiledMethod.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/aot/aotCompiledMethod.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -243,16 +243,6 @@
}
#endif // TIERED
-// We don't have full dependencies for AOT methods, so flushing is
-// more conservative than for nmethods.
-void AOTCompiledMethod::flush_evol_dependents_on(InstanceKlass* dependee) {
- if (is_java_method()) {
- clear_inline_caches();
- mark_for_deoptimization();
- make_not_entrant();
- }
-}
-
// Iterate over metadata calling this function. Used by RedefineClasses
// Copied from nmethod::metadata_do
void AOTCompiledMethod::metadata_do(void f(Metadata*)) {
--- a/src/hotspot/share/aot/aotCompiledMethod.hpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/aot/aotCompiledMethod.hpp Mon Sep 17 09:36:33 2018 -0700
@@ -238,11 +238,6 @@
address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }
void set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; }
-#ifdef HOTSWAP
- // Flushing and deoptimization in case of evolution
- void flush_evol_dependents_on(InstanceKlass* dependee);
-#endif // HOTSWAP
-
virtual void metadata_do(void f(Metadata*));
bool metadata_got_contains(Metadata **p) {
--- a/src/hotspot/share/aot/aotLoader.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/aot/aotLoader.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -101,15 +101,6 @@
}
}
-// Flushing and deoptimization in case of evolution
-void AOTLoader::flush_evol_dependents_on(InstanceKlass* dependee) {
- // make non entrant and mark for deoptimization
- FOR_ALL_AOT_HEAPS(heap) {
- (*heap)->flush_evol_dependents_on(dependee);
- }
- Deoptimization::deoptimize_dependents();
-}
-
/**
* List of core modules for which we search for shared libraries.
*/
--- a/src/hotspot/share/aot/aotLoader.hpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/aot/aotLoader.hpp Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -68,11 +68,6 @@
NOT_PRODUCT( static void print_statistics() NOT_AOT_RETURN; )
-#ifdef HOTSWAP
- // Flushing and deoptimization in case of evolution
- static void flush_evol_dependents_on(InstanceKlass* dependee) NOT_AOT_RETURN;
-#endif // HOTSWAP
-
static bool reconcile_dynamic_invoke(InstanceKlass* holder, int index, Method* adapter_method, Klass *appendix_klass) NOT_AOT({ return true; });
};
--- a/src/hotspot/share/classfile/classLoaderData.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/classfile/classLoaderData.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -769,6 +769,14 @@
if (_deallocate_list != NULL) {
delete _deallocate_list;
}
+
+ // Decrement refcounts of Symbols if created.
+ if (_name != NULL) {
+ _name->decrement_refcount();
+ }
+ if (_name_and_id != NULL) {
+ _name_and_id->decrement_refcount();
+ }
}
// Returns true if this class loader data is for the app class loader
--- a/src/hotspot/share/gc/shared/oopStorage.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -429,20 +429,20 @@
// Failed to make new block, no other thread made a block
// available while the mutex was released, and didn't get
// one from a deferred update either, so return failure.
- log_info(oopstorage, ref)("%s: failed block allocation", name());
+ log_debug(oopstorage, blocks)("%s: failed block allocation", name());
return NULL;
}
}
} else {
// Add new block to storage.
- log_info(oopstorage, blocks)("%s: new block " PTR_FORMAT, name(), p2i(block));
+ log_debug(oopstorage, blocks)("%s: new block " PTR_FORMAT, name(), p2i(block));
// Add new block to the _active_array, growing if needed.
if (!_active_array->push(block)) {
if (expand_active_array()) {
guarantee(_active_array->push(block), "push failed after expansion");
} else {
- log_info(oopstorage, blocks)("%s: failed active array expand", name());
+ log_debug(oopstorage, blocks)("%s: failed active array expand", name());
Block::delete_block(*block);
return NULL;
}
@@ -472,7 +472,7 @@
log_debug(oopstorage, blocks)("%s: block full " PTR_FORMAT, name(), p2i(block));
_allocation_list.unlink(*block);
}
- log_info(oopstorage, ref)("%s: allocated " PTR_FORMAT, name(), p2i(result));
+ log_trace(oopstorage, ref)("%s: allocated " PTR_FORMAT, name(), p2i(result));
return result;
}
@@ -484,8 +484,8 @@
assert_lock_strong(_allocation_mutex);
ActiveArray* old_array = _active_array;
size_t new_size = 2 * old_array->size();
- log_info(oopstorage, blocks)("%s: expand active array " SIZE_FORMAT,
- name(), new_size);
+ log_debug(oopstorage, blocks)("%s: expand active array " SIZE_FORMAT,
+ name(), new_size);
ActiveArray* new_array = ActiveArray::create(new_size, AllocFailStrategy::RETURN_NULL);
if (new_array == NULL) return false;
new_array->copy_from(old_array);
@@ -676,7 +676,7 @@
check_release_entry(ptr);
Block* block = find_block_or_null(ptr);
assert(block != NULL, "%s: invalid release " PTR_FORMAT, name(), p2i(ptr));
- log_info(oopstorage, ref)("%s: released " PTR_FORMAT, name(), p2i(ptr));
+ log_trace(oopstorage, ref)("%s: released " PTR_FORMAT, name(), p2i(ptr));
block->release_entries(block->bitmask_for_entry(ptr), &_deferred_updates);
Atomic::dec(&_allocation_count);
}
@@ -687,7 +687,7 @@
check_release_entry(ptrs[i]);
Block* block = find_block_or_null(ptrs[i]);
assert(block != NULL, "%s: invalid release " PTR_FORMAT, name(), p2i(ptrs[i]));
- log_info(oopstorage, ref)("%s: released " PTR_FORMAT, name(), p2i(ptrs[i]));
+ log_trace(oopstorage, ref)("%s: released " PTR_FORMAT, name(), p2i(ptrs[i]));
size_t count = 0;
uintx releasing = 0;
for ( ; i < size; ++i) {
@@ -696,7 +696,7 @@
// If entry not in block, finish block and resume outer loop with entry.
if (!block->contains(entry)) break;
// Add entry to releasing bitmap.
- log_info(oopstorage, ref)("%s: released " PTR_FORMAT, name(), p2i(entry));
+ log_trace(oopstorage, ref)("%s: released " PTR_FORMAT, name(), p2i(entry));
uintx entry_bitmask = block->bitmask_for_entry(entry);
assert((releasing & entry_bitmask) == 0,
"Duplicate entry: " PTR_FORMAT, p2i(entry));
@@ -740,7 +740,7 @@
void OopStorage::delete_empty_block(const Block& block) {
assert(block.is_empty(), "discarding non-empty block");
- log_info(oopstorage, blocks)("%s: delete empty block " PTR_FORMAT, name(), p2i(&block));
+ log_debug(oopstorage, blocks)("%s: delete empty block " PTR_FORMAT, name(), p2i(&block));
Block::delete_block(block);
}
@@ -933,11 +933,11 @@
}
bool OopStorage::BasicParState::finish_iteration(const IterationData* data) const {
- log_debug(oopstorage, blocks, stats)
- ("Parallel iteration on %s: blocks = " SIZE_FORMAT
- ", processed = " SIZE_FORMAT " (%2.f%%)",
- _storage->name(), _block_count, data->_processed,
- percent_of(data->_processed, _block_count));
+ log_info(oopstorage, blocks, stats)
+ ("Parallel iteration on %s: blocks = " SIZE_FORMAT
+ ", processed = " SIZE_FORMAT " (%2.f%%)",
+ _storage->name(), _block_count, data->_processed,
+ percent_of(data->_processed, _block_count));
return false;
}
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -69,12 +69,12 @@
}
void ThreadLocalAllocBuffer::accumulate_statistics() {
- Thread* thread = myThread();
- size_t capacity = Universe::heap()->tlab_capacity(thread);
- size_t used = Universe::heap()->tlab_used(thread);
+ Thread* thr = thread();
+ size_t capacity = Universe::heap()->tlab_capacity(thr);
+ size_t used = Universe::heap()->tlab_used(thr);
_gc_waste += (unsigned)remaining();
- size_t total_allocated = thread->allocated_bytes();
+ size_t total_allocated = thr->allocated_bytes();
size_t allocated_since_last_gc = total_allocated - _allocated_before_last_gc;
_allocated_before_last_gc = total_allocated;
@@ -119,7 +119,7 @@
invariants();
if (retire) {
- myThread()->incr_allocated_bytes(used_bytes());
+ thread()->incr_allocated_bytes(used_bytes());
}
Universe::heap()->fill_with_dummy_object(top(), hard_end(), retire && zap);
@@ -150,7 +150,7 @@
// Compute the next tlab size using expected allocation amount
assert(ResizeTLAB, "Should not call this otherwise");
size_t alloc = (size_t)(_allocation_fraction.average() *
- (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize));
+ (Universe::heap()->tlab_capacity(thread()) / HeapWordSize));
size_t new_size = alloc / _target_refills;
new_size = MIN2(MAX2(new_size, min_size()), max_size());
@@ -159,7 +159,7 @@
log_trace(gc, tlab)("TLAB new size: thread: " INTPTR_FORMAT " [id: %2d]"
" refills %d alloc: %8.6f desired_size: " SIZE_FORMAT " -> " SIZE_FORMAT,
- p2i(myThread()), myThread()->osthread()->thread_id(),
+ p2i(thread()), thread()->osthread()->thread_id(),
_target_refills, _allocation_fraction.average(), desired_size(), aligned_new_size);
set_desired_size(aligned_new_size);
@@ -211,7 +211,7 @@
// thread is initialized before the heap is. The initialization for
// this thread is redone in startup_initialization below.
if (Universe::heap() != NULL) {
- size_t capacity = Universe::heap()->tlab_capacity(myThread()) / HeapWordSize;
+ size_t capacity = Universe::heap()->tlab_capacity(thread()) / HeapWordSize;
double alloc_frac = desired_size() * target_refills() / (double) capacity;
_allocation_fraction.sample(alloc_frac);
}
@@ -274,7 +274,7 @@
// Initial size is a function of the average number of allocating threads.
unsigned nof_threads = global_stats()->allocating_threads_avg();
- init_sz = (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
+ init_sz = (Universe::heap()->tlab_capacity(thread()) / HeapWordSize) /
(nof_threads * target_refills());
init_sz = align_object_size(init_sz);
}
@@ -288,7 +288,7 @@
return;
}
- Thread* thrd = myThread();
+ Thread* thrd = thread();
size_t waste = _gc_waste + _slow_refill_waste + _fast_refill_waste;
double waste_percent = percent_of(waste, _allocated_size);
size_t tlab_used = Universe::heap()->tlab_used(thrd);
@@ -322,7 +322,7 @@
void ThreadLocalAllocBuffer::set_sample_end() {
size_t heap_words_remaining = pointer_delta(_end, _top);
- size_t bytes_until_sample = myThread()->heap_sampler().bytes_until_sample();
+ size_t bytes_until_sample = thread()->heap_sampler().bytes_until_sample();
size_t words_until_sample = bytes_until_sample / HeapWordSize;
if (heap_words_remaining > words_until_sample) {
@@ -334,10 +334,8 @@
}
}
-Thread* ThreadLocalAllocBuffer::myThread() {
- return (Thread*)(((char *)this) +
- in_bytes(start_offset()) -
- in_bytes(Thread::tlab_start_offset()));
+Thread* ThreadLocalAllocBuffer::thread() {
+ return (Thread*)(((char*)this) + in_bytes(start_offset()) - in_bytes(Thread::tlab_start_offset()));
}
void ThreadLocalAllocBuffer::set_back_allocation_end() {
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp Mon Sep 17 09:36:33 2018 -0700
@@ -101,7 +101,7 @@
void print_stats(const char* tag);
- Thread* myThread();
+ Thread* thread();
// statistics
@@ -192,15 +192,9 @@
// Code generation support
static ByteSize start_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _start); }
- static ByteSize end_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _end ); }
- static ByteSize top_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _top ); }
- static ByteSize pf_top_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _pf_top ); }
- static ByteSize size_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _desired_size ); }
- static ByteSize refill_waste_limit_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _refill_waste_limit ); }
-
- static ByteSize number_of_refills_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _number_of_refills ); }
- static ByteSize fast_refill_waste_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _fast_refill_waste ); }
- static ByteSize slow_allocations_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _slow_allocations ); }
+ static ByteSize end_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _end); }
+ static ByteSize top_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _top); }
+ static ByteSize pf_top_offset() { return byte_offset_of(ThreadLocalAllocBuffer, _pf_top); }
void verify();
};
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp Mon Sep 17 09:36:33 2018 -0700
@@ -57,8 +57,7 @@
// Compute the size for the new TLAB.
// The "last" tlab may be smaller to reduce fragmentation.
// unsafe_max_tlab_alloc is just a hint.
- const size_t available_size = Universe::heap()->unsafe_max_tlab_alloc(myThread()) /
- HeapWordSize;
+ const size_t available_size = Universe::heap()->unsafe_max_tlab_alloc(thread()) / HeapWordSize;
size_t new_tlab_size = MIN3(available_size, desired_size() + align_object_size(obj_size), max_size());
// Make sure there's enough room for object and filler int[].
@@ -92,7 +91,7 @@
" obj: " SIZE_FORMAT
" free: " SIZE_FORMAT
" waste: " SIZE_FORMAT,
- "slow", p2i(myThread()), myThread()->osthread()->thread_id(),
+ "slow", p2i(thread()), thread()->osthread()->thread_id(),
obj_size, free(), refill_waste_limit());
}
--- a/src/hotspot/share/gc/z/zRootsIterator.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -252,12 +252,10 @@
_jfr_weak(this) {
assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
ZStatTimer timer(ZSubPhasePauseWeakRootsSetup);
- StringTable::reset_dead_counter();
}
ZWeakRootsIterator::~ZWeakRootsIterator() {
ZStatTimer timer(ZSubPhasePauseWeakRootsTeardown);
- StringTable::finish_dead_counter();
}
void ZWeakRootsIterator::do_jvmti_weak_export(BoolObjectClosure* is_alive, OopClosure* cl) {
--- a/src/hotspot/share/prims/whitebox.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/prims/whitebox.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -178,6 +178,15 @@
return closure.found();
WB_END
+WB_ENTRY(jint, WB_GetSymbolRefcount(JNIEnv* env, jobject unused, jstring name))
+ oop h_name = JNIHandles::resolve(name);
+ if (h_name == NULL) return false;
+ Symbol* sym = java_lang_String::as_symbol(h_name, CHECK_0);
+ TempNewSymbol tsym(sym); // Make sure to decrement reference count on sym on return
+ return (jint)sym->refcount();
+WB_END
+
+
WB_ENTRY(void, WB_AddToBootstrapClassLoaderSearch(JNIEnv* env, jobject o, jstring segment)) {
#if INCLUDE_JVMTI
ResourceMark rm;
@@ -1982,7 +1991,6 @@
return (jint) SystemDictionary::pd_cache_table()->removed_entries_count();
WB_END
-
#define CC (char*)
static JNINativeMethod methods[] = {
@@ -1996,6 +2004,7 @@
{CC"getHeapSpaceAlignment", CC"()J", (void*)&WB_GetHeapSpaceAlignment},
{CC"getHeapAlignment", CC"()J", (void*)&WB_GetHeapAlignment},
{CC"isClassAlive0", CC"(Ljava/lang/String;)Z", (void*)&WB_IsClassAlive },
+ {CC"getSymbolRefcount", CC"(Ljava/lang/String;)I", (void*)&WB_GetSymbolRefcount },
{CC"parseCommandLine0",
CC"(Ljava/lang/String;C[Lsun/hotspot/parser/DiagnosticCommand;)[Ljava/lang/Object;",
(void*) &WB_ParseCommandLine
--- a/src/hotspot/share/runtime/thread.hpp Sat Sep 15 14:03:07 2018 -0700
+++ b/src/hotspot/share/runtime/thread.hpp Mon Sep 17 09:36:33 2018 -0700
@@ -698,20 +698,10 @@
static ByteSize polling_page_offset() { return byte_offset_of(Thread, _polling_page); }
-#define TLAB_FIELD_OFFSET(name) \
- static ByteSize tlab_##name##_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::name##_offset(); }
-
- TLAB_FIELD_OFFSET(start)
- TLAB_FIELD_OFFSET(end)
- TLAB_FIELD_OFFSET(top)
- TLAB_FIELD_OFFSET(pf_top)
- TLAB_FIELD_OFFSET(size) // desired_size
- TLAB_FIELD_OFFSET(refill_waste_limit)
- TLAB_FIELD_OFFSET(number_of_refills)
- TLAB_FIELD_OFFSET(fast_refill_waste)
- TLAB_FIELD_OFFSET(slow_allocations)
-
-#undef TLAB_FIELD_OFFSET
+ static ByteSize tlab_start_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::start_offset(); }
+ static ByteSize tlab_end_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::end_offset(); }
+ static ByteSize tlab_top_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::top_offset(); }
+ static ByteSize tlab_pf_top_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::pf_top_offset(); }
static ByteSize allocated_bytes_offset() { return byte_offset_of(Thread, _allocated_bytes); }
--- a/src/java.base/share/classes/java/lang/Object.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/lang/Object.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -455,7 +455,7 @@
"nanosecond timeout value out of range");
}
- if (nanos > 0) {
+ if (nanos > 0 && timeoutMillis < Long.MAX_VALUE) {
timeoutMillis++;
}
--- a/src/java.base/share/classes/java/lang/Thread.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/lang/Thread.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,6 +35,7 @@
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
import jdk.internal.misc.TerminatingThreadLocal;
@@ -332,7 +333,7 @@
"nanosecond timeout value out of range");
}
- if (nanos >= 500000 || (nanos != 0 && millis == 0)) {
+ if (nanos > 0 && millis < Long.MAX_VALUE) {
millis++;
}
@@ -1291,28 +1292,23 @@
* <i>interrupted status</i> of the current thread is
* cleared when this exception is thrown.
*/
- public final synchronized void join(long millis)
+ public final synchronized void join(final long millis)
throws InterruptedException {
- long base = System.currentTimeMillis();
- long now = 0;
-
- if (millis < 0) {
- throw new IllegalArgumentException("timeout value is negative");
- }
-
- if (millis == 0) {
+ if (millis > 0) {
+ if (isAlive()) {
+ final long startTime = System.nanoTime();
+ long delay = millis;
+ do {
+ wait(delay);
+ } while (isAlive() && (delay = millis -
+ TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime)) > 0);
+ }
+ } else if (millis == 0) {
while (isAlive()) {
wait(0);
}
} else {
- while (isAlive()) {
- long delay = millis - now;
- if (delay <= 0) {
- break;
- }
- wait(delay);
- now = System.currentTimeMillis() - base;
- }
+ throw new IllegalArgumentException("timeout value is negative");
}
}
@@ -1353,7 +1349,7 @@
"nanosecond timeout value out of range");
}
- if (nanos >= 500000 || (nanos != 0 && millis == 0)) {
+ if (nanos > 0 && millis < Long.MAX_VALUE) {
millis++;
}
--- a/src/java.base/share/classes/java/nio/file/Paths.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/nio/file/Paths.java Mon Sep 17 09:36:33 2018 -0700
@@ -73,7 +73,8 @@
* Converts the given URI to a {@link Path} object.
*
* @implSpec
- * This method simply invokes {@link Path#of(URI) * Path.of(URI)} with the given parameter.
+ * This method simply invokes {@link Path#of(URI) Path.of(URI)} with the
+ * given parameter.
*
* @param uri
* the URI to convert
--- a/src/java.base/share/classes/java/security/Identity.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/security/Identity.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -351,7 +351,7 @@
/**
* Tests for equality between the specified identity and this identity.
- * This method should be overriden by subclasses to test for equality.
+ * This method should be overridden by subclasses to test for equality.
* The default behavior is to return true if the names and public keys
* are equal.
*
--- a/src/java.base/share/classes/java/security/Provider.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/security/Provider.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1318,7 +1318,7 @@
* {@code "putProviderProperty."+name}, where {@code name} is
* the provider name, to see if it's ok to set this provider's property
* values. If the default implementation of {@code checkSecurityAccess}
- * is used (that is, that method is not overriden), then this results in
+ * is used (that is, that method is not overridden), then this results in
* a call to the security manager's {@code checkPermission} method with
* a {@code SecurityPermission("putProviderProperty."+name)}
* permission.
@@ -1410,7 +1410,7 @@
* the provider name, to see if it's ok to remove this provider's
* properties. If the default implementation of
* {@code checkSecurityAccess} is used (that is, that method is not
- * overriden), then this results in a call to the security manager's
+ * overridden), then this results in a call to the security manager's
* {@code checkPermission} method with a
* {@code SecurityPermission("removeProviderProperty."+name)}
* permission.
--- a/src/java.base/share/classes/java/security/Security.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/security/Security.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -422,7 +422,7 @@
* method is called with the string {@code "removeProvider."+name}
* to see if it's ok to remove the provider.
* If the default implementation of {@code checkSecurityAccess}
- * is used (i.e., that method is not overriden), then this will result in
+ * is used (i.e., that method is not overridden), then this will result in
* a call to the security manager's {@code checkPermission} method
* with a {@code SecurityPermission("removeProvider."+name)}
* permission.
--- a/src/java.base/share/classes/java/text/RuleBasedCollator.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -348,7 +348,7 @@
* Compares the character data stored in two different strings based on the
* collation rules. Returns information about whether a string is less
* than, greater than or equal to another string in a language.
- * This can be overriden in a subclass.
+ * This can be overridden in a subclass.
*
* @exception NullPointerException if <code>source</code> or <code>target</code> is null.
*/
@@ -567,7 +567,7 @@
/**
* Transforms the string into a series of characters that can be compared
* with CollationKey.compareTo. This overrides java.text.Collator.getCollationKey.
- * It can be overriden in a subclass.
+ * It can be overridden in a subclass.
*/
public synchronized CollationKey getCollationKey(String source)
{
--- a/src/java.base/share/classes/java/util/Random.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/util/Random.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -136,7 +136,7 @@
if (getClass() == Random.class)
this.seed = new AtomicLong(initialScramble(seed));
else {
- // subclass might have overriden setSeed
+ // subclass might have overridden setSeed
this.seed = new AtomicLong();
setSeed(seed);
}
--- a/src/java.base/share/classes/java/util/StringJoiner.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/java/util/StringJoiner.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@
private int len;
/**
- * When overriden by the user to be non-null via {@link setEmptyValue}, the
+ * When overridden by the user to be non-null via {@link setEmptyValue}, the
* string returned by toString() when no elements have yet been added.
* When null, prefix + suffix is used as the empty value.
*/
--- a/src/java.base/share/classes/javax/crypto/CipherInputStream.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/javax/crypto/CipherInputStream.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
* method counts only data that have been processed by the encapsulated Cipher.
*
* <p> It is crucial for a programmer using this class not to use
- * methods that are not defined or overriden in this class (such as a
+ * methods that are not defined or overridden in this class (such as a
* new method or constructor that is later added to one of the super
* classes), because the design and implementation of those methods
* are unlikely to have considered security impact with regard to
--- a/src/java.base/share/classes/javax/crypto/CipherOutputStream.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/javax/crypto/CipherOutputStream.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
* alternative to using this class.
*
* <p> It is crucial for a programmer using this class not to use
- * methods that are not defined or overriden in this class (such as a
+ * methods that are not defined or overridden in this class (such as a
* new method or constructor that is later added to one of the super
* classes), because the design and implementation of those methods
* are unlikely to have considered security impact with regard to
--- a/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
* However, the implementations can be replaced on a per-class (static) or
* per-instance basis. All new <code>HttpsURLConnection</code>s instances
* will be assigned
- * the "default" static values at instance creation, but they can be overriden
+ * the "default" static values at instance creation, but they can be overridden
* by calling the appropriate per-instance set method(s) before
* <code>connect</code>ing.
*
--- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
* authentication is necessary, and whether created sockets should
* begin handshaking in client or server mode. The state
* inherited by the created <code>SSLSocket</code> can be
- * overriden by calling the appropriate methods.
+ * overridden by calling the appropriate methods.
*
* @see java.net.ServerSocket
* @see SSLSocket
--- a/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
* Abstract class that provides for extension of the X509KeyManager
* interface.
* <P>
- * Methods in this class should be overriden to provide actual
+ * Methods in this class should be overridden to provide actual
* implementations.
*
* @since 1.5
--- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,6 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.security.AccessController;
import java.security.AlgorithmConstraints;
import java.security.AlgorithmParameters;
import java.security.CryptoPrimitive;
@@ -672,6 +671,11 @@
}
AlgorithmParameters params = namedGroupParams.get(namedGroup);
+ if (params == null) {
+ throw new RuntimeException(
+ "Not a supported EC named group: " + namedGroup);
+ }
+
try {
return params.getParameterSpec(ECGenParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
@@ -687,6 +691,11 @@
}
AlgorithmParameters params = namedGroupParams.get(namedGroup);
+ if (params == null) {
+ throw new RuntimeException(
+ "Not a supported DH named group: " + namedGroup);
+ }
+
try {
return params.getParameterSpec(DHParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
@@ -739,7 +748,7 @@
namedGroupParams.get(namedGroup));
}
- // Is there any supported group permitted by the constraints?
+ // Is the named group supported?
static boolean isSupported(NamedGroup namedGroup) {
for (NamedGroup group : supportedNamedGroups) {
if (namedGroup.id == group.id) {
@@ -757,6 +766,7 @@
for (NamedGroup namedGroup : requestedNamedGroups) {
if ((namedGroup.type == type) &&
namedGroup.isAvailable(negotiatedProtocol) &&
+ isSupported(namedGroup) &&
constraints.permits(
EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
namedGroup.algorithm,
--- a/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java Mon Sep 17 09:36:33 2018 -0700
@@ -281,7 +281,7 @@
.replaceFirst("H+", (isShort ? "\\%1\\$d" : "\\%1\\$02d"))
.replaceFirst("m+", "\\%2\\$02d");
return MessageFormat.format(gmtFormat,
- String.format(hourFormat, offset / 60, offset % 60));
+ String.format(l, hourFormat, offset / 60, offset % 60));
}
}
}
--- a/src/java.base/share/native/libzip/zip_util.c Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/share/native/libzip/zip_util.c Mon Sep 17 09:36:33 2018 -0700
@@ -100,6 +100,9 @@
static ZFILE
ZFILE_Open(const char *fname, int flags) {
#ifdef WIN32
+ WCHAR *wfname, *wprefixed_fname;
+ size_t converted_chars, fname_length;
+ jlong fhandle;
const DWORD access =
(flags & O_RDWR) ? (GENERIC_WRITE | GENERIC_READ) :
(flags & O_WRONLY) ? GENERIC_WRITE :
@@ -121,14 +124,37 @@
FILE_ATTRIBUTE_NORMAL;
const DWORD flagsAndAttributes = maybeWriteThrough | maybeDeleteOnClose;
- return (jlong) CreateFile(
- fname, /* Wide char path name */
- access, /* Read and/or write permission */
- sharing, /* File sharing flags */
- NULL, /* Security attributes */
- disposition, /* creation disposition */
- flagsAndAttributes, /* flags and attributes */
- NULL);
+ fname_length = strlen(fname);
+ if (fname_length < MAX_PATH) {
+ return (jlong)CreateFile(
+ fname, /* path name in multibyte char */
+ access, /* Read and/or write permission */
+ sharing, /* File sharing flags */
+ NULL, /* Security attributes */
+ disposition, /* creation disposition */
+ flagsAndAttributes, /* flags and attributes */
+ NULL);
+ } else {
+ if ((wfname = (WCHAR*)malloc((fname_length + 1) * sizeof(WCHAR))) == NULL)
+ return (jlong)INVALID_HANDLE_VALUE;
+
+ if (mbstowcs_s(&converted_chars, wfname, fname_length + 1, fname, fname_length) != 0) {
+ free(wfname);
+ return (jlong)INVALID_HANDLE_VALUE;
+ }
+ wprefixed_fname = getPrefixed(wfname, (int)fname_length);
+ fhandle = (jlong)CreateFileW(
+ wprefixed_fname, /* Wide char path name */
+ access, /* Read and/or write permission */
+ sharing, /* File sharing flags */
+ NULL, /* Security attributes */
+ disposition, /* creation disposition */
+ flagsAndAttributes, /* flags and attributes */
+ NULL);
+ free(wfname);
+ free(wprefixed_fname);
+ return fhandle;
+ }
#else
return open(fname, flags, 0);
#endif
--- a/src/java.base/solaris/native/libjvm_db/libjvm_db.h Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/solaris/native/libjvm_db/libjvm_db.h Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
#define OS_SOLARIS_DTRACE_LIBJVM_DB_H
#include <proc_service.h>
+#include "jni.h"
#ifdef __cplusplus
extern "C" {
@@ -35,7 +36,7 @@
#define JVM_DB_VERSION 1
-jvm_agent_t *Jagent_create(struct ps_prochandle *P, int vers);
+JNIEXPORT jvm_agent_t *Jagent_create(struct ps_prochandle *P, int vers);
/*
* Called from Jframe_iter() for each java frame. If it returns 0, then
@@ -57,9 +58,9 @@
* frames were found, or if there was some unrecoverable error. Otherwise,
* returns the last value returned from 'func'.
*/
-int Jframe_iter(jvm_agent_t *agent, prgregset_t gregs, java_stack_f *func, void* cld);
+JNIEXPORT int Jframe_iter(jvm_agent_t *agent, prgregset_t gregs, java_stack_f *func, void* cld);
-void Jagent_destroy(jvm_agent_t *J);
+JNIEXPORT void Jagent_destroy(jvm_agent_t *J);
#ifdef __cplusplus
} /* extern "C" */
--- a/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.h Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
#endif
#include <sys/types.h>
-
+#include "jni.h"
struct _jvm_t;
typedef struct _jvm_t jvm_t;
@@ -44,10 +44,10 @@
/* Attach to the given JVM process. Returns NULL on failure.
jvm_get_last_error() returns last error message. */
-jvm_t* jvm_attach(pid_t pid);
+JNIEXPORT jvm_t* jvm_attach(pid_t pid);
/* Returns the last error message from this library or NULL if none. */
-const char* jvm_get_last_error();
+JNIEXPORT const char* jvm_get_last_error();
/* few well-known probe type constants for 'probe_types' param below */
@@ -68,7 +68,7 @@
* On success, this returns number of probe_types enabled.
* On failure, jvm_get_last_error() returns the last error message.
*/
-int jvm_enable_dtprobes(jvm_t* jvm, int num_probe_types, const char** probe_types);
+JNIEXPORT int jvm_enable_dtprobes(jvm_t* jvm, int num_probe_types, const char** probe_types);
/* Note: There is no jvm_disable_dtprobes function. Probes are automatically
* disabled when there are no more clients requiring those probes.
@@ -77,7 +77,7 @@
/* Detach the given JVM. Returns 0 on success, -1 on failure.
* jvm_get_last_error() returns the last error message.
*/
-int jvm_detach(jvm_t* jvm);
+JNIEXPORT int jvm_detach(jvm_t* jvm);
#ifdef __cplusplus
}
--- a/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@
return uc;
}
- // Template method to be overriden by Java Plug-in. [stanleyh]
+ // Template method to be overridden by Java Plug-in. [stanleyh]
//
protected URLConnection createFileURLConnection(URL u, File file)
{
--- a/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,7 @@
}
/**
- * Template method to be overriden by Java Plug-in. [stanleyh]
+ * Template method to be overridden by Java Plug-in. [stanleyh]
*/
protected URLConnection createFileURLConnection(URL url, File file) {
return new FileURLConnection(url, file);
--- a/src/java.base/windows/conf/tzmappings Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-#
-# This file describes mapping information between Windows and Java
-# time zones.
-# Format: Each line should include a colon separated fields of Windows
-# time zone registry key, time zone mapID, locale (which is most
-# likely used in the time zone), and Java time zone ID. Blank lines
-# and lines that start with '#' are ignored. Data lines must be sorted
-# by mapID (ASCII order).
-#
-# NOTE
-# This table format is not a public interface of any Java
-# platforms. No applications should depend on this file in any form.
-#
-# This table has been generated by a program and should not be edited
-# manually.
-#
-Romance:-1,64::Europe/Paris:
-Romance Standard Time:-1,64::Europe/Paris:
-Warsaw:-1,65::Europe/Warsaw:
-Central Europe:-1,66::Europe/Prague:
-Central Europe Standard Time:-1,66::Europe/Prague:
-Prague Bratislava:-1,66::Europe/Prague:
-W. Central Africa Standard Time:-1,66:AO:Africa/Luanda:
-FLE:-1,67:FI:Europe/Helsinki:
-FLE Standard Time:-1,67:FI:Europe/Helsinki:
-GFT:-1,67::Europe/Athens:
-GFT Standard Time:-1,67::Europe/Athens:
-GTB:-1,67::Europe/Athens:
-GTB Standard Time:-1,67::Europe/Athens:
-Israel:-1,70::Asia/Jerusalem:
-Israel Standard Time:-1,70::Asia/Jerusalem:
-Arab:-1,71::Asia/Riyadh:
-Arab Standard Time:-1,71::Asia/Riyadh:
-Arabic Standard Time:-1,71:IQ:Asia/Baghdad:
-E. Africa:-1,71:KE:Africa/Nairobi:
-E. Africa Standard Time:-1,71:KE:Africa/Nairobi:
-Saudi Arabia:-1,71::Asia/Riyadh:
-Saudi Arabia Standard Time:-1,71::Asia/Riyadh:
-Iran:-1,72::Asia/Tehran:
-Iran Standard Time:-1,72::Asia/Tehran:
-Afghanistan:-1,73::Asia/Kabul:
-Afghanistan Standard Time:-1,73::Asia/Kabul:
-India:-1,74::Asia/Calcutta:
-India Standard Time:-1,74::Asia/Calcutta:
-Myanmar Standard Time:-1,74::Asia/Rangoon:
-Nepal Standard Time:-1,74::Asia/Katmandu:
-Sri Lanka:-1,74:LK:Asia/Colombo:
-Sri Lanka Standard Time:-1,74:LK:Asia/Colombo:
-Beijing:-1,75::Asia/Shanghai:
-China:-1,75::Asia/Shanghai:
-China Standard Time:-1,75::Asia/Shanghai:
-AUS Central:-1,76::Australia/Darwin:
-AUS Central Standard Time:-1,76::Australia/Darwin:
-Cen. Australia:-1,76::Australia/Adelaide:
-Cen. Australia Standard Time:-1,76::Australia/Adelaide:
-Vladivostok:-1,77::Asia/Vladivostok:
-Vladivostok Standard Time:-1,77::Asia/Vladivostok:
-West Pacific:-1,77:GU:Pacific/Guam:
-West Pacific Standard Time:-1,77:GU:Pacific/Guam:
-E. South America:-1,80::America/Sao_Paulo:
-E. South America Standard Time:-1,80::America/Sao_Paulo:
-Greenland Standard Time:-1,80:GL:America/Godthab:
-Newfoundland:-1,81::America/St_Johns:
-Newfoundland Standard Time:-1,81::America/St_Johns:
-Pacific SA:-1,82::America/Santiago:
-Pacific SA Standard Time:-1,82::America/Santiago:
-SA Western:-1,82:BO:America/La_Paz:
-SA Western Standard Time:-1,82:BO:America/La_Paz:
-SA Pacific:-1,83::America/Bogota:
-SA Pacific Standard Time:-1,83::America/Bogota:
-US Eastern:-1,84::America/Indianapolis:
-US Eastern Standard Time:-1,84::America/Indianapolis:
-Central America Standard Time:-1,85::America/Regina:
-Mexico:-1,85::America/Mexico_City:
-Mexico Standard Time:-1,85::America/Mexico_City:
-Canada Central:-1,86::America/Regina:
-Canada Central Standard Time:-1,86::America/Regina:
-US Mountain:-1,87::America/Phoenix:
-US Mountain Standard Time:-1,87::America/Phoenix:
-GMT:0,1::Europe/London:
-GMT Standard Time:0,1::Europe/London:
-Ekaterinburg:10,11::Asia/Yekaterinburg:
-Ekaterinburg Standard Time:10,11::Asia/Yekaterinburg:
-West Asia:10,11:UZ:Asia/Tashkent:
-West Asia Standard Time:10,11:UZ:Asia/Tashkent:
-Central Asia:12,13::Asia/Almaty:
-Central Asia Standard Time:12,13::Asia/Almaty:
-N. Central Asia Standard Time:12,13::Asia/Novosibirsk:
-Bangkok:14,15::Asia/Bangkok:
-Bangkok Standard Time:14,15::Asia/Bangkok:
-North Asia Standard Time:14,15::Asia/Krasnoyarsk:
-SE Asia:14,15::Asia/Bangkok:
-SE Asia Standard Time:14,15::Asia/Bangkok:
-North Asia East Standard Time:16,17:RU:Asia/Irkutsk:
-Singapore:16,17:SG:Asia/Singapore:
-Singapore Standard Time:16,17:SG:Asia/Singapore:
-Taipei:16,17::Asia/Taipei:
-Taipei Standard Time:16,17::Asia/Taipei:
-W. Australia:16,17:AU:Australia/Perth:
-W. Australia Standard Time:16,17:AU:Australia/Perth:
-Korea:18,19:KR:Asia/Seoul:
-Korea Standard Time:18,19:KR:Asia/Seoul:
-Tokyo:18,19::Asia/Tokyo:
-Tokyo Standard Time:18,19::Asia/Tokyo:
-Yakutsk:18,19:RU:Asia/Yakutsk:
-Yakutsk Standard Time:18,19:RU:Asia/Yakutsk:
-Central European:2,3:CS:Europe/Belgrade:
-Central European Standard Time:2,3:CS:Europe/Belgrade:
-W. Europe:2,3::Europe/Berlin:
-W. Europe Standard Time:2,3::Europe/Berlin:
-Tasmania:20,-1::Australia/Hobart:
-Tasmania Standard Time:20,-1::Australia/Hobart:
-AUS Eastern:20,21::Australia/Sydney:
-AUS Eastern Standard Time:20,21::Australia/Sydney:
-E. Australia:20,21::Australia/Brisbane:
-E. Australia Standard Time:20,21::Australia/Brisbane:
-Sydney Standard Time:20,21::Australia/Sydney:
-Tasmania Standard Time:20,65::Australia/Hobart:
-Central Pacific:22,23::Pacific/Guadalcanal:
-Central Pacific Standard Time:22,23::Pacific/Guadalcanal:
-Dateline:24,25::GMT-1200:
-Dateline Standard Time:24,25::GMT-1200:
-Fiji:24,25::Pacific/Fiji:
-Fiji Standard Time:24,25::Pacific/Fiji:
-Samoa:26,27::Pacific/Apia:
-Samoa Standard Time:26,27::Pacific/Apia:
-Hawaiian:28,29::Pacific/Honolulu:
-Hawaiian Standard Time:28,29::Pacific/Honolulu:
-Alaskan:30,31::America/Anchorage:
-Alaskan Standard Time:30,31::America/Anchorage:
-Pacific:32,33::America/Los_Angeles:
-Pacific Standard Time:32,33::America/Los_Angeles:
-Mexico Standard Time 2:34,35:MX:America/Chihuahua:
-Mountain:34,35::America/Denver:
-Mountain Standard Time:34,35::America/Denver:
-Central:36,37::America/Chicago:
-Central Standard Time:36,37::America/Chicago:
-Eastern:38,39::America/New_York:
-Eastern Standard Time:38,39::America/New_York:
-E. Europe:4,5::EET:
-E. Europe Standard Time:4,5::EET:
-Egypt:4,68::Africa/Cairo:
-Egypt Standard Time:4,68::Africa/Cairo:
-South Africa:4,69::Africa/Harare:
-South Africa Standard Time:4,69::Africa/Harare:
-Atlantic:40,41::America/Halifax:
-Atlantic Standard Time:40,41::America/Halifax:
-SA Eastern:42,43:GF:America/Cayenne:
-SA Eastern Standard Time:42,43:GF:America/Cayenne:
-Mid-Atlantic:44,45::Atlantic/South_Georgia:
-Mid-Atlantic Standard Time:44,45::Atlantic/South_Georgia:
-Azores:46,47::Atlantic/Azores:
-Azores Standard Time:46,47::Atlantic/Azores:
-Cape Verde Standard Time:46,47::Atlantic/Cape_Verde:
-Russian:6,7::Europe/Moscow:
-Russian Standard Time:6,7::Europe/Moscow:
-New Zealand:78,79::Pacific/Auckland:
-New Zealand Standard Time:78,79::Pacific/Auckland:
-Tonga Standard Time:78,79::Pacific/Tongatapu:
-Arabian:8,9::Asia/Muscat:
-Arabian Standard Time:8,9::Asia/Muscat:
-Caucasus:8,9:AM:Asia/Yerevan:
-Caucasus Standard Time:8,9:AM:Asia/Yerevan:
-GMT Standard Time:88,89::GMT:
-Greenwich:88,89::GMT:
-Greenwich Standard Time:88,89::GMT:
-Aleutian Standard Time:900,900:US:America/Adak:
-Altai Standard Time:901,901::Asia/Barnaul:
-Argentina Standard Time:902,902::America/Buenos_Aires:
-Armenian Standard Time:903,903:AM:Asia/Yerevan:
-Astrakhan Standard Time:904,904::Europe/Astrakhan:
-Aus Central W. Standard Time:905,905::Australia/Eucla:
-Azerbaijan Standard Time:906,906:AZ:Asia/Baku:
-Bahia Standard Time:907,907::America/Bahia:
-Bangladesh Standard Time:908,908::Asia/Dhaka:
-Belarus Standard Time:909,909:BY:Europe/Minsk:
-Bougainville Standard Time:910,910::Pacific/Bougainville:
-Central Brazilian Standard Time:911,911:BR:America/Cuiaba:
-Central Standard Time (Mexico):912,912::America/Mexico_City:
-Chatham Islands Standard Time:913,913::Pacific/Chatham:
-Cuba Standard Time:914,914:CU:America/Havana:
-Easter Island Standard Time:915,915:CL:Pacific/Easter:
-Eastern Standard Time (Mexico):916,916::America/Cancun:
-Georgian Standard Time:917,917:GE:Asia/Tbilisi:
-Haiti Standard Time:918,918:HT:America/Port-au-Prince:
-Jordan Standard Time:919,919:JO:Asia/Amman:
-Kaliningrad Standard Time:920,920:RU:Europe/Kaliningrad:
-Kamchatka Standard Time:921,921:RU:Asia/Kamchatka:
-Libya Standard Time:922,922:LY:Africa/Tripoli:
-Line Islands Standard Time:923,923::Pacific/Kiritimati:
-Lord Howe Standard Time:924,924::Australia/Lord_Howe:
-Magadan Standard Time:925,925::Asia/Magadan:
-Marquesas Standard Time:926,926::Pacific/Marquesas:
-Mauritius Standard Time:927,927:MU:Indian/Mauritius:
-Middle East Standard Time:928,928:LB:Asia/Beirut:
-Montevideo Standard Time:929,929:UY:America/Montevideo:
-Morocco Standard Time:930,930:MA:Africa/Casablanca:
-Mountain Standard Time (Mexico):931,931:MX:America/Chihuahua:
-Namibia Standard Time:932,932:NA:Africa/Windhoek:
-Norfolk Standard Time:933,933::Pacific/Norfolk:
-North Korea Standard Time:934,934:KP:Asia/Pyongyang:
-Pacific Standard Time (Mexico):935,935:MX:America/Tijuana:
-Pakistan Standard Time:936,936::Asia/Karachi:
-Paraguay Standard Time:937,937:PY:America/Asuncion:
-Russia Time Zone 10:938,938::Asia/Srednekolymsk:
-Russia Time Zone 11:939,939::Asia/Anadyr:
-Russia Time Zone 3:940,940::Europe/Samara:
-Saint Pierre Standard Time:941,941:PM:America/Miquelon:
-Sakhalin Standard Time:942,942::Asia/Sakhalin:
-Syria Standard Time:943,943:SY:Asia/Damascus:
-Tocantins Standard Time:944,944::America/Araguaina:
-Tomsk Standard Time:945,945::Asia/Tomsk:
-Transbaikal Standard Time:946,946::Asia/Chita:
-Turkey Standard Time:947,947::Asia/Istanbul:
-Turks And Caicos Standard Time:948,948:TC:America/Grand_Turk:
-UTC+12:949,949::GMT+1200:
-UTC-02:950,950::GMT-0200:
-UTC-08:951,951::GMT-0800:
-UTC-09:952,952::GMT-0900:
-UTC-11:953,953::GMT-1100:
-UTC:954,954::UTC:
-Ulaanbaatar Standard Time:955,955::Asia/Ulaanbaatar:
-Venezuela Standard Time:956,956::America/Caracas:
-W. Mongolia Standard Time:957,957::Asia/Hovd:
-West Bank Standard Time:958,958::Asia/Gaza:
-Western Brazilian Standard Time:959,959:BR:America/Rio_Branco:
--- a/src/java.base/windows/native/libjava/TimeZone_md.c Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/windows/native/libjava/TimeZone_md.c Mon Sep 17 09:36:33 2018 -0700
@@ -36,6 +36,7 @@
#define MAX_ZONE_CHAR 256
#define MAX_MAPID_LENGTH 32
+#define MAX_REGION_LENGTH 4
#define NT_TZ_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"
#define WIN_TZ_KEY "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Time Zones"
@@ -145,7 +146,7 @@
/*
* Gets the current time zone entry in the "Time Zones" registry.
*/
-static int getWinTimeZone(char *winZoneName, char *winMapID)
+static int getWinTimeZone(char *winZoneName)
{
DYNAMIC_TIME_ZONE_INFORMATION dtzi;
DWORD timeType;
@@ -231,7 +232,6 @@
WCHAR stdNameInReg[MAX_ZONE_CHAR];
TziValue tempTzi;
WCHAR *stdNamePtr = tzi.StandardName;
- DWORD valueSize;
int onlyMapID;
timeType = GetTimeZoneInformation(&tzi);
@@ -372,24 +372,7 @@
(void) RegCloseKey(hSubKey);
}
- /*
- * Get the "MapID" value of the registry to be able to eliminate
- * duplicated key names later.
- */
- valueSize = MAX_MAPID_LENGTH;
- ret = RegQueryValueExA(hSubKey, "MapID", NULL, &valueType, winMapID, &valueSize);
- (void) RegCloseKey(hSubKey);
(void) RegCloseKey(hKey);
-
- if (ret != ERROR_SUCCESS) {
- /*
- * Vista doesn't have mapID. VALUE_UNKNOWN should be returned
- * only for Windows NT.
- */
- if (onlyMapID == 1) {
- return VALUE_UNKNOWN;
- }
- }
}
return VALUE_KEY;
@@ -410,24 +393,17 @@
* Index values for the mapping table.
*/
#define TZ_WIN_NAME 0
-#define TZ_MAPID 1
-#define TZ_REGION 2
-#define TZ_JAVA_NAME 3
+#define TZ_REGION 1
+#define TZ_JAVA_NAME 2
-#define TZ_NITEMS 4 /* number of items (fields) */
+#define TZ_NITEMS 3 /* number of items (fields) */
/*
* Looks up the mapping table (tzmappings) and returns a Java time
* zone ID (e.g., "America/Los_Angeles") if found. Otherwise, NULL is
* returned.
- *
- * value_type is one of the following values:
- * VALUE_KEY for exact key matching
- * VALUE_MAPID for MapID (this is
- * required for the old Windows, such as NT 4.0 SP3).
*/
-static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName,
- char *mapID)
+static char *matchJavaTZ(const char *java_home_dir, char *tzName)
{
int line;
int IDmatched = 0;
@@ -436,9 +412,22 @@
char *items[TZ_NITEMS];
char *mapFileName;
char lineBuffer[MAX_ZONE_CHAR * 4];
- int noMapID = *mapID == '\0'; /* no mapID on Vista and later */
int offset = 0;
const char* errorMessage = "unknown error";
+ char region[MAX_REGION_LENGTH];
+
+ // Get the user's location
+ if (GetGeoInfo(GetUserGeoID(GEOCLASS_NATION),
+ GEO_ISO2, region, MAX_REGION_LENGTH, 0) == 0) {
+ // If GetGeoInfo fails, fallback to LCID's country
+ LCID lcid = GetUserDefaultLCID();
+ if (GetLocaleInfo(lcid,
+ LOCALE_SISO3166CTRYNAME, region, MAX_REGION_LENGTH) == 0 &&
+ GetLocaleInfo(lcid,
+ LOCALE_SISO3166CTRYNAME2, region, MAX_REGION_LENGTH) == 0) {
+ region[0] = '\0';
+ }
+ }
mapFileName = malloc(strlen(java_home_dir) + strlen(MAPPINGS_FILE) + 1);
if (mapFileName == NULL) {
@@ -494,28 +483,20 @@
goto illegal_format;
}
- if (noMapID || strcmp(mapID, items[TZ_MAPID]) == 0) {
+ /*
+ * We need to scan items until the
+ * exact match is found or the end of data is detected.
+ */
+ if (strcmp(items[TZ_WIN_NAME], tzName) == 0) {
/*
- * When there's no mapID, we need to scan items until the
- * exact match is found or the end of data is detected.
+ * Found the time zone in the mapping table.
+ * Check the region code and select the appropriate entry
*/
- if (!noMapID) {
- IDmatched = 1;
- }
- if (strcmp(items[TZ_WIN_NAME], tzName) == 0) {
- /*
- * Found the time zone in the mapping table.
- */
+ if (strcmp(items[TZ_REGION], region) == 0 ||
+ strcmp(items[TZ_REGION], "001") == 0) {
javaTZName = _strdup(items[TZ_JAVA_NAME]);
break;
}
- } else {
- if (IDmatched == 1) {
- /*
- * No need to look up the mapping table further.
- */
- break;
- }
}
}
fclose(fp);
@@ -535,19 +516,16 @@
char *findJavaTZ_md(const char *java_home_dir)
{
char winZoneName[MAX_ZONE_CHAR];
- char winMapID[MAX_MAPID_LENGTH];
char *std_timezone = NULL;
int result;
- winMapID[0] = 0;
- result = getWinTimeZone(winZoneName, winMapID);
+ result = getWinTimeZone(winZoneName);
if (result != VALUE_UNKNOWN) {
if (result == VALUE_GMTOFFSET) {
std_timezone = _strdup(winZoneName);
} else {
- std_timezone = matchJavaTZ(java_home_dir, result,
- winZoneName, winMapID);
+ std_timezone = matchJavaTZ(java_home_dir, winZoneName);
if (std_timezone == NULL) {
std_timezone = getGMTOffsetID();
}
--- a/src/java.base/windows/native/libjava/canonicalize_md.c Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/windows/native/libjava/canonicalize_md.c Mon Sep 17 09:36:33 2018 -0700
@@ -225,6 +225,8 @@
return 1;
}
+int wcanonicalize(WCHAR *orig_path, WCHAR *result, int size);
+
/* Convert a pathname to canonical form. The input orig_path is assumed to
have been converted to native form already, via JVM_NativePath(). This is
necessary because _fullpath() rejects duplicate separator characters on
@@ -237,6 +239,38 @@
HANDLE h;
char path[1024]; /* Working copy of path */
char *src, *dst, *dend;
+ wchar_t *worig_path, *wresult;
+ size_t converted_chars = 0;
+
+ /* handle long path with length >= MAX_PATH */
+ if (strlen(orig_path) >= MAX_PATH) {
+ if ((worig_path = (WCHAR*)malloc(size * sizeof(WCHAR))) == NULL)
+ return -1;
+
+ if (mbstowcs_s(&converted_chars, worig_path, (size_t)size, orig_path, (size_t)(size - 1)) != 0) {
+ free(worig_path);
+ return -1;
+ }
+
+ if ((wresult = (WCHAR*)malloc(size * sizeof(WCHAR))) == NULL)
+ return -1;
+
+ if (wcanonicalize(worig_path, wresult, size) != 0) {
+ free(worig_path);
+ free(wresult);
+ return -1;
+ }
+
+ if (wcstombs_s(&converted_chars, result, (size_t)size, wresult, (size_t)(size - 1)) != 0) {
+ free(worig_path);
+ free(wresult);
+ return -1;
+ }
+
+ free(worig_path);
+ free(wresult);
+ return 0;
+ }
/* Reject paths that contain wildcards */
if (wild(orig_path)) {
@@ -245,15 +279,15 @@
}
/* Collapse instances of "foo\.." and ensure absoluteness. Note that
- contrary to the documentation, the _fullpath procedure does not require
- the drive to be available. It also does not reliably change all
- occurrences of '/' to '\\' on Win95, so now JVM_NativePath does that. */
- if(!_fullpath(path, orig_path, sizeof(path))) {
+ contrary to the documentation, the _fullpath procedure does not require
+ the drive to be available. It also does not reliably change all
+ occurrences of '/' to '\\' on Win95, so now JVM_NativePath does that. */
+ if (!_fullpath(path, orig_path, sizeof(path))) {
return -1;
}
/* Correction for Win95: _fullpath may leave a trailing "\\"
- on a UNC pathname */
+ on a UNC pathname */
if ((path[0] == '\\') && (path[1] == '\\')) {
char *p = path + strlen(path);
if ((p[-1] == '\\') && !islb(p[-2])) {
@@ -281,16 +315,16 @@
char *p;
p = nextsep(src + 2); /* Skip past host name */
if (!*p) {
- /* A UNC pathname must begin with "\\\\host\\share",
- so reject this path as invalid if there is no share name */
+ /* A UNC pathname must begin with "\\\\host\\share",
+ so reject this path as invalid if there is no share name */
errno = EINVAL;
return -1;
- }
- p = nextsep(p + 1); /* Skip past share name */
- if (!(dst = cp(dst, dend, '\0', src, p))) {
- return -1;
- }
- src = p;
+ }
+ p = nextsep(p + 1); /* Skip past share name */
+ if (!(dst = cp(dst, dend, '\0', src, p))) {
+ return -1;
+ }
+ src = p;
} else {
/* Invalid path */
errno = EINVAL;
@@ -309,11 +343,11 @@
}
/* At this point we have copied either a drive specifier ("z:") or a UNC
- prefix ("\\\\host\\share") to the result buffer, and src points to the
- first byte of the remainder of the path. We now scan through the rest
- of the path, looking up each prefix in order to find the true name of
- the last element of each prefix, thereby computing the full true name of
- the original path. */
+ prefix ("\\\\host\\share") to the result buffer, and src points to the
+ first byte of the remainder of the path. We now scan through the rest
+ of the path, looking up each prefix in order to find the true name of
+ the last element of each prefix, thereby computing the full true name of
+ the original path. */
while (*src) {
char *p = nextsep(src + 1); /* Find next separator */
char c = *p;
@@ -325,8 +359,8 @@
/* Lookup succeeded; append true name to result and continue */
FindClose(h);
if (!(dst = cp(dst, dend, '\\',
- fd.cFileName,
- fd.cFileName + strlen(fd.cFileName)))) {
+ fd.cFileName,
+ fd.cFileName + strlen(fd.cFileName)))) {
return -1;
}
src = p;
@@ -344,8 +378,8 @@
}
if (dst >= dend) {
- errno = ENAMETOOLONG;
- return -1;
+ errno = ENAMETOOLONG;
+ return -1;
}
*dst = '\0';
return 0;
@@ -587,7 +621,7 @@
*/
/* copy \\?\ or \\?\UNC\ to the front of path*/
-WCHAR*
+__declspec(dllexport) WCHAR*
getPrefixed(const WCHAR* path, int pathlen) {
WCHAR* pathbuf = (WCHAR*)malloc((pathlen + 10) * sizeof (WCHAR));
if (pathbuf != 0) {
--- a/src/java.base/windows/native/libjava/io_util_md.h Sat Sep 15 14:03:07 2018 -0700
+++ b/src/java.base/windows/native/libjava/io_util_md.h Mon Sep 17 09:36:33 2018 -0700
@@ -38,7 +38,7 @@
*/
WCHAR* pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE);
WCHAR* fileToNTPath(JNIEnv *env, jobject file, jfieldID id);
-WCHAR* getPrefixed(const WCHAR* path, int pathlen);
+__declspec(dllexport) WCHAR* getPrefixed(const WCHAR* path, int pathlen);
WCHAR* currentDir(int di);
int currentDirLength(const WCHAR* path, int pathlen);
int handleAvailable(FD fd, jlong *pbytes);
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiledClass.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompiledClass.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java Mon Sep 17 09:36:33 2018 -0700
@@ -2057,7 +2057,9 @@
// evaluate and discard the first expression, then evaluate the second.
JCExpression makeComma(final JCExpression expr1, final JCExpression expr2) {
- return abstractRval(expr1, discarded -> expr2);
+ JCExpression res = make.LetExpr(List.of(make.Exec(expr1)), expr2);
+ res.type = expr2.type;
+ return res;
}
/**************************************************************************
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Sep 17 09:36:33 2018 -0700
@@ -183,7 +183,7 @@
//if this is a default method, add the DEFAULT flag to the enclosing interface
if ((tree.mods.flags & DEFAULT) != 0) {
- m.enclClass().flags_field |= DEFAULT;
+ m.owner.flags_field |= DEFAULT;
}
Env<AttrContext> localEnv = methodEnv(tree, env);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Mon Sep 17 09:36:33 2018 -0700
@@ -1536,13 +1536,12 @@
JCCompilationUnit topLevel;
public void visitTopLevel(JCCompilationUnit node) {
if (node.packge != null) {
- if (node.packge.package_info != null) {
+ if (isPkgInfo(node.sourcefile, Kind.SOURCE)) {
node.packge.package_info.reset();
}
node.packge.reset();
}
- boolean isModuleInfo = node.sourcefile.isNameCompatible("module-info", Kind.SOURCE);
- if (isModuleInfo) {
+ if (isModuleInfo(node.sourcefile, Kind.SOURCE)) {
node.modle.reset();
node.modle.completer = sym -> modules.enter(List.of(node), node.modle.module_info);
node.modle.module_info.reset();
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java Mon Sep 17 09:36:33 2018 -0700
@@ -37,6 +37,7 @@
import sun.jvm.hotspot.gc.epsilon.*;
import sun.jvm.hotspot.gc.g1.*;
import sun.jvm.hotspot.gc.parallel.*;
+import sun.jvm.hotspot.gc.z.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
@@ -366,6 +367,10 @@
} else if (heap instanceof G1CollectedHeap) {
G1CollectedHeap g1h = (G1CollectedHeap) heap;
g1h.heapRegionIterate(lrc);
+ } else if (heap instanceof ZCollectedHeap) {
+ // Operation (currently) not supported with ZGC. Print
+ // a warning and leave the list of live regions empty.
+ System.err.println("Warning: Operation not supported with ZGC");
} else if (heap instanceof EpsilonHeap) {
EpsilonHeap eh = (EpsilonHeap) heap;
liveRegions.add(eh.space().top());
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java Mon Sep 17 09:36:33 2018 -0700
@@ -50,6 +50,7 @@
this.usedSize = usedSize;
visitedSize = 0;
userHeapVisitor.prologue(usedSize);
+ thunk.heapIterationFractionUpdate(0.0);
}
public boolean doObj(Oop obj) {
--- a/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalRuntimeMBean.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalRuntimeMBean.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,6 +24,7 @@
package org.graalvm.compiler.hotspot.management;
+import org.graalvm.compiler.phases.common.jmx.HotSpotMBeanOperationProvider;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -49,6 +50,7 @@
import org.graalvm.compiler.options.OptionDescriptor;
import org.graalvm.compiler.options.OptionDescriptors;
import org.graalvm.compiler.options.OptionsParser;
+import org.graalvm.compiler.serviceprovider.GraalServices;
/**
* MBean used to access properties and operations of a {@link HotSpotGraalRuntime} instance.
@@ -170,11 +172,32 @@
if (DEBUG) {
System.out.printf("invoke: %s%s%n", actionName, Arrays.asList(params));
}
- Object retvalue = runtime.invokeManagementAction(actionName, params);
+ Object retvalue = null;
+ if ("dumpMethod".equals(actionName)) {
+ retvalue = runtime.invokeManagementAction(actionName, params);
+ } else {
+ boolean found = false;
+ for (HotSpotMBeanOperationProvider p : GraalServices.load(HotSpotMBeanOperationProvider.class)) {
+ List<MBeanOperationInfo> info = new ArrayList<>();
+ p.registerOperations(MBeanOperationInfo.class, info);
+ for (MBeanOperationInfo op : info) {
+ if (actionName.equals(op.getName())) {
+ retvalue = p.invoke(actionName, params, signature);
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ throw new MBeanException(new IllegalStateException("Cannot find operation " + actionName));
+ }
+ }
if (DEBUG) {
System.out.printf("invoke: %s%s = %s%n", actionName, Arrays.asList(params), retvalue);
}
return retvalue;
+ } catch (MBeanException ex) {
+ throw ex;
} catch (Exception ex) {
throw new ReflectionException(ex);
}
@@ -198,30 +221,35 @@
return o1.getName().compareTo(o2.getName());
}
});
- MBeanOperationInfo[] ops = {
- new MBeanOperationInfo("dumpMethod", "Enable IGV dumps for provided method", new MBeanParameterInfo[]{
- new MBeanParameterInfo("className", "java.lang.String", "Class to observe"),
- new MBeanParameterInfo("methodName", "java.lang.String", "Method to observe"),
- }, "void", MBeanOperationInfo.ACTION),
- new MBeanOperationInfo("dumpMethod", "Enable IGV dumps for provided method", new MBeanParameterInfo[]{
- new MBeanParameterInfo("className", "java.lang.String", "Class to observe"),
- new MBeanParameterInfo("methodName", "java.lang.String", "Method to observe"),
- new MBeanParameterInfo("filter", "java.lang.String", "The parameter for Dump option"),
- }, "void", MBeanOperationInfo.ACTION),
- new MBeanOperationInfo("dumpMethod", "Enable IGV dumps for provided method", new MBeanParameterInfo[]{
- new MBeanParameterInfo("className", "java.lang.String", "Class to observe"),
- new MBeanParameterInfo("methodName", "java.lang.String", "Method to observe"),
- new MBeanParameterInfo("filter", "java.lang.String", "The parameter for Dump option"),
- new MBeanParameterInfo("host", "java.lang.String", "The host where the IGV tool is running at"),
- new MBeanParameterInfo("port", "int", "The port where the IGV tool is listening at"),
- }, "void", MBeanOperationInfo.ACTION)
- };
+ List<MBeanOperationInfo> opts = new ArrayList<>();
+ opts.add(new MBeanOperationInfo("dumpMethod", "Enable IGV dumps for provided method", new MBeanParameterInfo[]{
+ new MBeanParameterInfo("className", "java.lang.String", "Class to observe"),
+ new MBeanParameterInfo("methodName", "java.lang.String", "Method to observe"),
+ }, "void", MBeanOperationInfo.ACTION));
+ opts.add(new MBeanOperationInfo("dumpMethod", "Enable IGV dumps for provided method", new MBeanParameterInfo[]{
+ new MBeanParameterInfo("className", "java.lang.String", "Class to observe"),
+ new MBeanParameterInfo("methodName", "java.lang.String", "Method to observe"),
+ new MBeanParameterInfo("filter", "java.lang.String", "The parameter for Dump option"),
+ }, "void", MBeanOperationInfo.ACTION));
+ opts.add(new MBeanOperationInfo("dumpMethod", "Enable IGV dumps for provided method", new MBeanParameterInfo[]{
+ new MBeanParameterInfo("className", "java.lang.String", "Class to observe"),
+ new MBeanParameterInfo("methodName", "java.lang.String", "Method to observe"),
+ new MBeanParameterInfo("filter", "java.lang.String", "The parameter for Dump option"),
+ new MBeanParameterInfo("host", "java.lang.String", "The host where the IGV tool is running at"),
+ new MBeanParameterInfo("port", "int", "The port where the IGV tool is listening at"),
+ }, "void", MBeanOperationInfo.ACTION));
+
+ for (HotSpotMBeanOperationProvider p : GraalServices.load(HotSpotMBeanOperationProvider.class)) {
+ p.registerOperations(MBeanOperationInfo.class, opts);
+ }
return new MBeanInfo(
HotSpotGraalRuntimeMBean.class.getName(),
"Graal",
attrs.toArray(new MBeanAttributeInfo[attrs.size()]),
- null, ops, null);
+ null,
+ opts.toArray(new MBeanOperationInfo[opts.size()]),
+ null);
}
private static EconomicMap<String, OptionDescriptor> getOptionDescriptors() {
--- a/src/jdk.internal.vm.compiler/share/classes/module-info.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/module-info.java Mon Sep 17 09:36:33 2018 -0700
@@ -74,6 +74,7 @@
jdk.aot,
jdk.internal.vm.compiler.management;
exports org.graalvm.compiler.phases to jdk.aot;
+ exports org.graalvm.compiler.phases.common.jmx to jdk.internal.vm.compiler.management;
exports org.graalvm.compiler.phases.tiers to jdk.aot;
exports org.graalvm.compiler.printer to jdk.aot;
exports org.graalvm.compiler.runtime to jdk.aot;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java Mon Sep 17 09:36:33 2018 -0700
@@ -52,6 +52,8 @@
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L128;
+import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L256;
+import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LZ;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F38;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F3A;
@@ -78,7 +80,6 @@
import jdk.vm.ci.amd64.AMD64;
import jdk.vm.ci.amd64.AMD64.CPUFeature;
-import jdk.vm.ci.amd64.AMD64Kind;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.Register.RegisterCategory;
import jdk.vm.ci.code.TargetDescription;
@@ -893,7 +894,7 @@
}
}
- private enum AVXOpAssertion {
+ private enum VEXOpAssertion {
AVX1(CPUFeature.AVX, CPUFeature.AVX),
AVX1_2(CPUFeature.AVX, CPUFeature.AVX2),
AVX2(CPUFeature.AVX2, CPUFeature.AVX2),
@@ -903,23 +904,25 @@
XMM_CPU(CPUFeature.AVX, null, XMM, null, CPU, null),
XMM_XMM_CPU(CPUFeature.AVX, null, XMM, XMM, CPU, null),
CPU_XMM(CPUFeature.AVX, null, CPU, null, XMM, null),
- AVX1_2_CPU_XMM(CPUFeature.AVX, CPUFeature.AVX2, CPU, null, XMM, null);
-
- private final CPUFeature avx128feature;
- private final CPUFeature avx256feature;
+ AVX1_2_CPU_XMM(CPUFeature.AVX, CPUFeature.AVX2, CPU, null, XMM, null),
+ BMI1(CPUFeature.BMI1, null, CPU, CPU, CPU, null),
+ BMI2(CPUFeature.BMI2, null, CPU, CPU, CPU, null);
+
+ private final CPUFeature l128feature;
+ private final CPUFeature l256feature;
private final RegisterCategory rCategory;
private final RegisterCategory vCategory;
private final RegisterCategory mCategory;
private final RegisterCategory imm8Category;
- AVXOpAssertion(CPUFeature avx128feature, CPUFeature avx256feature) {
- this(avx128feature, avx256feature, XMM, XMM, XMM, XMM);
+ VEXOpAssertion(CPUFeature l128feature, CPUFeature l256feature) {
+ this(l128feature, l256feature, XMM, XMM, XMM, XMM);
}
- AVXOpAssertion(CPUFeature avx128feature, CPUFeature avx256feature, RegisterCategory rCategory, RegisterCategory vCategory, RegisterCategory mCategory, RegisterCategory imm8Category) {
- this.avx128feature = avx128feature;
- this.avx256feature = avx256feature;
+ VEXOpAssertion(CPUFeature l128feature, CPUFeature l256feature, RegisterCategory rCategory, RegisterCategory vCategory, RegisterCategory mCategory, RegisterCategory imm8Category) {
+ this.l128feature = l128feature;
+ this.l256feature = l256feature;
this.rCategory = rCategory;
this.vCategory = vCategory;
this.mCategory = mCategory;
@@ -927,16 +930,20 @@
}
public boolean check(AMD64 arch, AVXSize size, Register r, Register v, Register m) {
- return check(arch, size, r, v, m, null);
+ return check(arch, getLFlag(size), r, v, m, null);
}
public boolean check(AMD64 arch, AVXSize size, Register r, Register v, Register m, Register imm8) {
- switch (size) {
- case XMM:
- assert avx128feature != null && arch.getFeatures().contains(avx128feature) : "emitting illegal 128 bit instruction";
+ return check(arch, getLFlag(size), r, v, m, imm8);
+ }
+
+ public boolean check(AMD64 arch, int l, Register r, Register v, Register m, Register imm8) {
+ switch (l) {
+ case L128:
+ assert l128feature != null && arch.getFeatures().contains(l128feature) : "emitting illegal 128 bit instruction";
break;
- case YMM:
- assert avx256feature != null && arch.getFeatures().contains(avx256feature) : "emitting illegal 256 bit instruction";
+ case L256:
+ assert l256feature != null && arch.getFeatures().contains(l256feature) : "emitting illegal 256 bit instruction";
break;
}
if (r != null) {
@@ -957,9 +964,9 @@
public boolean supports(EnumSet<CPUFeature> features, AVXSize avxSize) {
switch (avxSize) {
case XMM:
- return avx128feature != null && features.contains(avx128feature);
+ return l128feature != null && features.contains(l128feature);
case YMM:
- return avx256feature != null && features.contains(avx256feature);
+ return l256feature != null && features.contains(l256feature);
default:
throw GraalError.shouldNotReachHere();
}
@@ -976,9 +983,9 @@
protected final int op;
private final String opcode;
- protected final AVXOpAssertion assertion;
-
- protected VexOp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ protected final VEXOpAssertion assertion;
+
+ protected VexOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
this.pp = pp;
this.mmmmm = mmmmm;
this.w = w;
@@ -987,10 +994,6 @@
this.assertion = assertion;
}
- public boolean isSupported(AMD64Assembler vasm, AMD64Kind kind) {
- return assertion.supports(((AMD64) vasm.target.arch).getFeatures(), AVXKind.getRegisterSize(kind));
- }
-
public final boolean isSupported(AMD64Assembler vasm, AVXSize size) {
return assertion.supports(((AMD64) vasm.target.arch).getFeatures(), size);
}
@@ -1006,14 +1009,14 @@
*/
public static class VexRROp extends VexOp {
// @formatter:off
- public static final VexRROp VMASKMOVDQU = new VexRROp("VMASKMOVDQU", P_66, M_0F, WIG, 0xF7, AVXOpAssertion.AVX1_128ONLY);
+ public static final VexRROp VMASKMOVDQU = new VexRROp("VMASKMOVDQU", P_66, M_0F, WIG, 0xF7, VEXOpAssertion.AVX1_128ONLY);
// @formatter:on
protected VexRROp(String opcode, int pp, int mmmmm, int w, int op) {
- this(opcode, pp, mmmmm, w, op, AVXOpAssertion.AVX1);
+ this(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1);
}
- protected VexRROp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ protected VexRROp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1031,10 +1034,10 @@
*/
public static class VexRMOp extends VexRROp {
// @formatter:off
- public static final VexRMOp VCVTTSS2SI = new VexRMOp("VCVTTSS2SI", P_F3, M_0F, W0, 0x2C, AVXOpAssertion.CPU_XMM);
- public static final VexRMOp VCVTTSS2SQ = new VexRMOp("VCVTTSS2SQ", P_F3, M_0F, W1, 0x2C, AVXOpAssertion.CPU_XMM);
- public static final VexRMOp VCVTTSD2SI = new VexRMOp("VCVTTSD2SI", P_F2, M_0F, W0, 0x2C, AVXOpAssertion.CPU_XMM);
- public static final VexRMOp VCVTTSD2SQ = new VexRMOp("VCVTTSD2SQ", P_F2, M_0F, W1, 0x2C, AVXOpAssertion.CPU_XMM);
+ public static final VexRMOp VCVTTSS2SI = new VexRMOp("VCVTTSS2SI", P_F3, M_0F, W0, 0x2C, VEXOpAssertion.CPU_XMM);
+ public static final VexRMOp VCVTTSS2SQ = new VexRMOp("VCVTTSS2SQ", P_F3, M_0F, W1, 0x2C, VEXOpAssertion.CPU_XMM);
+ public static final VexRMOp VCVTTSD2SI = new VexRMOp("VCVTTSD2SI", P_F2, M_0F, W0, 0x2C, VEXOpAssertion.CPU_XMM);
+ public static final VexRMOp VCVTTSD2SQ = new VexRMOp("VCVTTSD2SQ", P_F2, M_0F, W1, 0x2C, VEXOpAssertion.CPU_XMM);
public static final VexRMOp VCVTPS2PD = new VexRMOp("VCVTPS2PD", P_, M_0F, WIG, 0x5A);
public static final VexRMOp VCVTPD2PS = new VexRMOp("VCVTPD2PS", P_66, M_0F, WIG, 0x5A);
public static final VexRMOp VCVTDQ2PS = new VexRMOp("VCVTDQ2PS", P_, M_0F, WIG, 0x5B);
@@ -1042,14 +1045,14 @@
public static final VexRMOp VCVTTPD2DQ = new VexRMOp("VCVTTPD2DQ", P_66, M_0F, WIG, 0xE6);
public static final VexRMOp VCVTDQ2PD = new VexRMOp("VCVTDQ2PD", P_F3, M_0F, WIG, 0xE6);
public static final VexRMOp VBROADCASTSS = new VexRMOp("VBROADCASTSS", P_66, M_0F38, W0, 0x18);
- public static final VexRMOp VBROADCASTSD = new VexRMOp("VBROADCASTSD", P_66, M_0F38, W0, 0x19, AVXOpAssertion.AVX1_256ONLY);
- public static final VexRMOp VBROADCASTF128 = new VexRMOp("VBROADCASTF128", P_66, M_0F38, W0, 0x1A, AVXOpAssertion.AVX1_256ONLY);
- public static final VexRMOp VPBROADCASTI128 = new VexRMOp("VPBROADCASTI128", P_66, M_0F38, W0, 0x5A, AVXOpAssertion.AVX2_256ONLY);
- public static final VexRMOp VPBROADCASTB = new VexRMOp("VPBROADCASTB", P_66, M_0F38, W0, 0x78, AVXOpAssertion.AVX2);
- public static final VexRMOp VPBROADCASTW = new VexRMOp("VPBROADCASTW", P_66, M_0F38, W0, 0x79, AVXOpAssertion.AVX2);
- public static final VexRMOp VPBROADCASTD = new VexRMOp("VPBROADCASTD", P_66, M_0F38, W0, 0x58, AVXOpAssertion.AVX2);
- public static final VexRMOp VPBROADCASTQ = new VexRMOp("VPBROADCASTQ", P_66, M_0F38, W0, 0x59, AVXOpAssertion.AVX2);
- public static final VexRMOp VPMOVMSKB = new VexRMOp("VPMOVMSKB", P_66, M_0F, WIG, 0xD7, AVXOpAssertion.AVX1_2_CPU_XMM);
+ public static final VexRMOp VBROADCASTSD = new VexRMOp("VBROADCASTSD", P_66, M_0F38, W0, 0x19, VEXOpAssertion.AVX1_256ONLY);
+ public static final VexRMOp VBROADCASTF128 = new VexRMOp("VBROADCASTF128", P_66, M_0F38, W0, 0x1A, VEXOpAssertion.AVX1_256ONLY);
+ public static final VexRMOp VPBROADCASTI128 = new VexRMOp("VPBROADCASTI128", P_66, M_0F38, W0, 0x5A, VEXOpAssertion.AVX2_256ONLY);
+ public static final VexRMOp VPBROADCASTB = new VexRMOp("VPBROADCASTB", P_66, M_0F38, W0, 0x78, VEXOpAssertion.AVX2);
+ public static final VexRMOp VPBROADCASTW = new VexRMOp("VPBROADCASTW", P_66, M_0F38, W0, 0x79, VEXOpAssertion.AVX2);
+ public static final VexRMOp VPBROADCASTD = new VexRMOp("VPBROADCASTD", P_66, M_0F38, W0, 0x58, VEXOpAssertion.AVX2);
+ public static final VexRMOp VPBROADCASTQ = new VexRMOp("VPBROADCASTQ", P_66, M_0F38, W0, 0x59, VEXOpAssertion.AVX2);
+ public static final VexRMOp VPMOVMSKB = new VexRMOp("VPMOVMSKB", P_66, M_0F, WIG, 0xD7, VEXOpAssertion.AVX1_2_CPU_XMM);
public static final VexRMOp VPMOVSXBW = new VexRMOp("VPMOVSXBW", P_66, M_0F38, WIG, 0x20);
public static final VexRMOp VPMOVSXBD = new VexRMOp("VPMOVSXBD", P_66, M_0F38, WIG, 0x21);
public static final VexRMOp VPMOVSXBQ = new VexRMOp("VPMOVSXBQ", P_66, M_0F38, WIG, 0x22);
@@ -1072,10 +1075,10 @@
// @formatter:on
protected VexRMOp(String opcode, int pp, int mmmmm, int w, int op) {
- this(opcode, pp, mmmmm, w, op, AVXOpAssertion.AVX1);
+ this(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1);
}
- protected VexRMOp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ protected VexRMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1103,17 +1106,17 @@
public static final VexMoveOp VMOVUPD = new VexMoveOp("VMOVUPD", P_66, M_0F, WIG, 0x10, 0x11);
public static final VexMoveOp VMOVSS = new VexMoveOp("VMOVSS", P_F3, M_0F, WIG, 0x10, 0x11);
public static final VexMoveOp VMOVSD = new VexMoveOp("VMOVSD", P_F2, M_0F, WIG, 0x10, 0x11);
- public static final VexMoveOp VMOVD = new VexMoveOp("VMOVD", P_66, M_0F, W0, 0x6E, 0x7E, AVXOpAssertion.XMM_CPU);
- public static final VexMoveOp VMOVQ = new VexMoveOp("VMOVQ", P_66, M_0F, W1, 0x6E, 0x7E, AVXOpAssertion.XMM_CPU);
+ public static final VexMoveOp VMOVD = new VexMoveOp("VMOVD", P_66, M_0F, W0, 0x6E, 0x7E, VEXOpAssertion.XMM_CPU);
+ public static final VexMoveOp VMOVQ = new VexMoveOp("VMOVQ", P_66, M_0F, W1, 0x6E, 0x7E, VEXOpAssertion.XMM_CPU);
// @formatter:on
private final int opReverse;
private VexMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse) {
- this(opcode, pp, mmmmm, w, op, opReverse, AVXOpAssertion.AVX1);
+ this(opcode, pp, mmmmm, w, op, opReverse, VEXOpAssertion.AVX1);
}
- private VexMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse, AVXOpAssertion assertion) {
+ private VexMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
this.opReverse = opReverse;
}
@@ -1142,13 +1145,13 @@
*/
public static final class VexRMIOp extends VexOp implements VexRRIOp {
// @formatter:off
- public static final VexRMIOp VPERMQ = new VexRMIOp("VPERMQ", P_66, M_0F3A, W1, 0x00, AVXOpAssertion.AVX2_256ONLY);
- public static final VexRMIOp VPSHUFLW = new VexRMIOp("VPSHUFLW", P_F2, M_0F, WIG, 0x70, AVXOpAssertion.AVX1_2);
- public static final VexRMIOp VPSHUFHW = new VexRMIOp("VPSHUFHW", P_F3, M_0F, WIG, 0x70, AVXOpAssertion.AVX1_2);
- public static final VexRMIOp VPSHUFD = new VexRMIOp("VPSHUFD", P_66, M_0F, WIG, 0x70, AVXOpAssertion.AVX1_2);
+ public static final VexRMIOp VPERMQ = new VexRMIOp("VPERMQ", P_66, M_0F3A, W1, 0x00, VEXOpAssertion.AVX2_256ONLY);
+ public static final VexRMIOp VPSHUFLW = new VexRMIOp("VPSHUFLW", P_F2, M_0F, WIG, 0x70, VEXOpAssertion.AVX1_2);
+ public static final VexRMIOp VPSHUFHW = new VexRMIOp("VPSHUFHW", P_F3, M_0F, WIG, 0x70, VEXOpAssertion.AVX1_2);
+ public static final VexRMIOp VPSHUFD = new VexRMIOp("VPSHUFD", P_66, M_0F, WIG, 0x70, VEXOpAssertion.AVX1_2);
// @formatter:on
- private VexRMIOp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ private VexRMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1175,15 +1178,15 @@
*/
public static final class VexMRIOp extends VexOp implements VexRRIOp {
// @formatter:off
- public static final VexMRIOp VEXTRACTF128 = new VexMRIOp("VEXTRACTF128", P_66, M_0F3A, W0, 0x19, AVXOpAssertion.AVX1_256ONLY);
- public static final VexMRIOp VEXTRACTI128 = new VexMRIOp("VEXTRACTI128", P_66, M_0F3A, W0, 0x39, AVXOpAssertion.AVX2_256ONLY);
- public static final VexMRIOp VPEXTRB = new VexMRIOp("VPEXTRB", P_66, M_0F3A, W0, 0x14, AVXOpAssertion.XMM_CPU);
- public static final VexMRIOp VPEXTRW = new VexMRIOp("VPEXTRW", P_66, M_0F3A, W0, 0x15, AVXOpAssertion.XMM_CPU);
- public static final VexMRIOp VPEXTRD = new VexMRIOp("VPEXTRD", P_66, M_0F3A, W0, 0x16, AVXOpAssertion.XMM_CPU);
- public static final VexMRIOp VPEXTRQ = new VexMRIOp("VPEXTRQ", P_66, M_0F3A, W1, 0x16, AVXOpAssertion.XMM_CPU);
+ public static final VexMRIOp VEXTRACTF128 = new VexMRIOp("VEXTRACTF128", P_66, M_0F3A, W0, 0x19, VEXOpAssertion.AVX1_256ONLY);
+ public static final VexMRIOp VEXTRACTI128 = new VexMRIOp("VEXTRACTI128", P_66, M_0F3A, W0, 0x39, VEXOpAssertion.AVX2_256ONLY);
+ public static final VexMRIOp VPEXTRB = new VexMRIOp("VPEXTRB", P_66, M_0F3A, W0, 0x14, VEXOpAssertion.XMM_CPU);
+ public static final VexMRIOp VPEXTRW = new VexMRIOp("VPEXTRW", P_66, M_0F3A, W0, 0x15, VEXOpAssertion.XMM_CPU);
+ public static final VexMRIOp VPEXTRD = new VexMRIOp("VPEXTRD", P_66, M_0F3A, W0, 0x16, VEXOpAssertion.XMM_CPU);
+ public static final VexMRIOp VPEXTRQ = new VexMRIOp("VPEXTRQ", P_66, M_0F3A, W1, 0x16, VEXOpAssertion.XMM_CPU);
// @formatter:on
- private VexMRIOp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ private VexMRIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1210,12 +1213,12 @@
*/
public static class VexRVMROp extends VexOp {
// @formatter:off
- public static final VexRVMROp VPBLENDVB = new VexRVMROp("VPBLENDVB", P_66, M_0F3A, W0, 0x4C, AVXOpAssertion.AVX1_2);
- public static final VexRVMROp VPBLENDVPS = new VexRVMROp("VPBLENDVPS", P_66, M_0F3A, W0, 0x4A, AVXOpAssertion.AVX1);
- public static final VexRVMROp VPBLENDVPD = new VexRVMROp("VPBLENDVPD", P_66, M_0F3A, W0, 0x4B, AVXOpAssertion.AVX1);
+ public static final VexRVMROp VPBLENDVB = new VexRVMROp("VPBLENDVB", P_66, M_0F3A, W0, 0x4C, VEXOpAssertion.AVX1_2);
+ public static final VexRVMROp VPBLENDVPS = new VexRVMROp("VPBLENDVPS", P_66, M_0F3A, W0, 0x4A, VEXOpAssertion.AVX1);
+ public static final VexRVMROp VPBLENDVPD = new VexRVMROp("VPBLENDVPD", P_66, M_0F3A, W0, 0x4B, VEXOpAssertion.AVX1);
// @formatter:on
- protected VexRVMROp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ protected VexRVMROp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1275,43 +1278,43 @@
public static final VexRVMOp VMAXSD = new VexRVMOp("VMAXSD", P_F2, M_0F, WIG, 0x5F);
public static final VexRVMOp VADDSUBPS = new VexRVMOp("VADDSUBPS", P_F2, M_0F, WIG, 0xD0);
public static final VexRVMOp VADDSUBPD = new VexRVMOp("VADDSUBPD", P_66, M_0F, WIG, 0xD0);
- public static final VexRVMOp VPAND = new VexRVMOp("VPAND", P_66, M_0F, WIG, 0xDB, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPOR = new VexRVMOp("VPOR", P_66, M_0F, WIG, 0xEB, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPXOR = new VexRVMOp("VPXOR", P_66, M_0F, WIG, 0xEF, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPADDB = new VexRVMOp("VPADDB", P_66, M_0F, WIG, 0xFC, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPADDW = new VexRVMOp("VPADDW", P_66, M_0F, WIG, 0xFD, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPADDD = new VexRVMOp("VPADDD", P_66, M_0F, WIG, 0xFE, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPADDQ = new VexRVMOp("VPADDQ", P_66, M_0F, WIG, 0xD4, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPMULHUW = new VexRVMOp("VPMULHUW", P_66, M_0F, WIG, 0xE4, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPMULHW = new VexRVMOp("VPMULHW", P_66, M_0F, WIG, 0xE5, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPMULLW = new VexRVMOp("VPMULLW", P_66, M_0F, WIG, 0xD5, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPMULLD = new VexRVMOp("VPMULLD", P_66, M_0F38, WIG, 0x40, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPSUBB = new VexRVMOp("VPSUBB", P_66, M_0F, WIG, 0xF8, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPSUBW = new VexRVMOp("VPSUBW", P_66, M_0F, WIG, 0xF9, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPSUBD = new VexRVMOp("VPSUBD", P_66, M_0F, WIG, 0xFA, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPSUBQ = new VexRVMOp("VPSUBQ", P_66, M_0F, WIG, 0xFB, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPSHUFB = new VexRVMOp("VPSHUFB", P_66, M_0F38, WIG, 0x00, AVXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPAND = new VexRVMOp("VPAND", P_66, M_0F, WIG, 0xDB, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPOR = new VexRVMOp("VPOR", P_66, M_0F, WIG, 0xEB, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPXOR = new VexRVMOp("VPXOR", P_66, M_0F, WIG, 0xEF, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPADDB = new VexRVMOp("VPADDB", P_66, M_0F, WIG, 0xFC, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPADDW = new VexRVMOp("VPADDW", P_66, M_0F, WIG, 0xFD, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPADDD = new VexRVMOp("VPADDD", P_66, M_0F, WIG, 0xFE, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPADDQ = new VexRVMOp("VPADDQ", P_66, M_0F, WIG, 0xD4, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPMULHUW = new VexRVMOp("VPMULHUW", P_66, M_0F, WIG, 0xE4, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPMULHW = new VexRVMOp("VPMULHW", P_66, M_0F, WIG, 0xE5, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPMULLW = new VexRVMOp("VPMULLW", P_66, M_0F, WIG, 0xD5, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPMULLD = new VexRVMOp("VPMULLD", P_66, M_0F38, WIG, 0x40, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPSUBB = new VexRVMOp("VPSUBB", P_66, M_0F, WIG, 0xF8, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPSUBW = new VexRVMOp("VPSUBW", P_66, M_0F, WIG, 0xF9, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPSUBD = new VexRVMOp("VPSUBD", P_66, M_0F, WIG, 0xFA, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPSUBQ = new VexRVMOp("VPSUBQ", P_66, M_0F, WIG, 0xFB, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPSHUFB = new VexRVMOp("VPSHUFB", P_66, M_0F38, WIG, 0x00, VEXOpAssertion.AVX1_2);
public static final VexRVMOp VCVTSD2SS = new VexRVMOp("VCVTSD2SS", P_F2, M_0F, WIG, 0x5A);
public static final VexRVMOp VCVTSS2SD = new VexRVMOp("VCVTSS2SD", P_F3, M_0F, WIG, 0x5A);
- public static final VexRVMOp VCVTSI2SD = new VexRVMOp("VCVTSI2SD", P_F2, M_0F, W0, 0x2A, AVXOpAssertion.XMM_XMM_CPU);
- public static final VexRVMOp VCVTSQ2SD = new VexRVMOp("VCVTSQ2SD", P_F2, M_0F, W1, 0x2A, AVXOpAssertion.XMM_XMM_CPU);
- public static final VexRVMOp VCVTSI2SS = new VexRVMOp("VCVTSI2SS", P_F3, M_0F, W0, 0x2A, AVXOpAssertion.XMM_XMM_CPU);
- public static final VexRVMOp VCVTSQ2SS = new VexRVMOp("VCVTSQ2SS", P_F3, M_0F, W1, 0x2A, AVXOpAssertion.XMM_XMM_CPU);
- public static final VexRVMOp VPCMPEQB = new VexRVMOp("VPCMPEQB", P_66, M_0F, WIG, 0x74, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPEQW = new VexRVMOp("VPCMPEQW", P_66, M_0F, WIG, 0x75, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPEQD = new VexRVMOp("VPCMPEQD", P_66, M_0F, WIG, 0x76, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPEQQ = new VexRVMOp("VPCMPEQQ", P_66, M_0F38, WIG, 0x29, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPGTB = new VexRVMOp("VPCMPGTB", P_66, M_0F, WIG, 0x64, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPGTW = new VexRVMOp("VPCMPGTW", P_66, M_0F, WIG, 0x65, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPGTD = new VexRVMOp("VPCMPGTD", P_66, M_0F, WIG, 0x66, AVXOpAssertion.AVX1_2);
- public static final VexRVMOp VPCMPGTQ = new VexRVMOp("VPCMPGTQ", P_66, M_0F38, WIG, 0x37, AVXOpAssertion.AVX1_2);
+ public static final VexRVMOp VCVTSI2SD = new VexRVMOp("VCVTSI2SD", P_F2, M_0F, W0, 0x2A, VEXOpAssertion.XMM_XMM_CPU);
+ public static final VexRVMOp VCVTSQ2SD = new VexRVMOp("VCVTSQ2SD", P_F2, M_0F, W1, 0x2A, VEXOpAssertion.XMM_XMM_CPU);
+ public static final VexRVMOp VCVTSI2SS = new VexRVMOp("VCVTSI2SS", P_F3, M_0F, W0, 0x2A, VEXOpAssertion.XMM_XMM_CPU);
+ public static final VexRVMOp VCVTSQ2SS = new VexRVMOp("VCVTSQ2SS", P_F3, M_0F, W1, 0x2A, VEXOpAssertion.XMM_XMM_CPU);
+ public static final VexRVMOp VPCMPEQB = new VexRVMOp("VPCMPEQB", P_66, M_0F, WIG, 0x74, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPEQW = new VexRVMOp("VPCMPEQW", P_66, M_0F, WIG, 0x75, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPEQD = new VexRVMOp("VPCMPEQD", P_66, M_0F, WIG, 0x76, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPEQQ = new VexRVMOp("VPCMPEQQ", P_66, M_0F38, WIG, 0x29, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPGTB = new VexRVMOp("VPCMPGTB", P_66, M_0F, WIG, 0x64, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPGTW = new VexRVMOp("VPCMPGTW", P_66, M_0F, WIG, 0x65, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPGTD = new VexRVMOp("VPCMPGTD", P_66, M_0F, WIG, 0x66, VEXOpAssertion.AVX1_2);
+ public static final VexRVMOp VPCMPGTQ = new VexRVMOp("VPCMPGTQ", P_66, M_0F38, WIG, 0x37, VEXOpAssertion.AVX1_2);
// @formatter:on
private VexRVMOp(String opcode, int pp, int mmmmm, int w, int op) {
- this(opcode, pp, mmmmm, w, op, AVXOpAssertion.AVX1);
+ this(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1);
}
- protected VexRVMOp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ protected VexRVMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1330,6 +1333,65 @@
}
}
+ public static final class VexGeneralPurposeRVMOp extends VexOp {
+ // @formatter:off
+ public static final VexGeneralPurposeRVMOp ANDN = new VexGeneralPurposeRVMOp("ANDN", P_, M_0F38, WIG, 0xF2, VEXOpAssertion.BMI1);
+ public static final VexGeneralPurposeRVMOp MULX = new VexGeneralPurposeRVMOp("MULX", P_F2, M_0F38, WIG, 0xF6, VEXOpAssertion.BMI2);
+ public static final VexGeneralPurposeRVMOp PDEP = new VexGeneralPurposeRVMOp("PDEP", P_F2, M_0F38, WIG, 0xF5, VEXOpAssertion.BMI2);
+ public static final VexGeneralPurposeRVMOp PEXT = new VexGeneralPurposeRVMOp("PEXT", P_F3, M_0F38, WIG, 0xF5, VEXOpAssertion.BMI2);
+ // @formatter:on
+
+ private VexGeneralPurposeRVMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
+ super(opcode, pp, mmmmm, w, op, assertion);
+ }
+
+ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2) {
+ assert assertion.check((AMD64) asm.target.arch, LZ, dst, src1, src2, null);
+ assert size == AVXSize.DWORD || size == AVXSize.QWORD;
+ asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1);
+ asm.emitByte(op);
+ asm.emitModRM(dst, src2);
+ }
+
+ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2) {
+ assert assertion.check((AMD64) asm.target.arch, LZ, dst, src1, null, null);
+ assert size == AVXSize.DWORD || size == AVXSize.QWORD;
+ asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1);
+ asm.emitByte(op);
+ asm.emitOperandHelper(dst, src2, 0);
+ }
+ }
+
+ public static final class VexGeneralPurposeRMVOp extends VexOp {
+ // @formatter:off
+ public static final VexGeneralPurposeRMVOp BEXTR = new VexGeneralPurposeRMVOp("BEXTR", P_, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI1);
+ public static final VexGeneralPurposeRMVOp BZHI = new VexGeneralPurposeRMVOp("BZHI", P_, M_0F38, WIG, 0xF5, VEXOpAssertion.BMI2);
+ public static final VexGeneralPurposeRMVOp SARX = new VexGeneralPurposeRMVOp("SARX", P_F3, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI2);
+ public static final VexGeneralPurposeRMVOp SHRX = new VexGeneralPurposeRMVOp("SHRX", P_F2, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI2);
+ public static final VexGeneralPurposeRMVOp SHLX = new VexGeneralPurposeRMVOp("SHLX", P_66, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI2);
+ // @formatter:on
+
+ private VexGeneralPurposeRMVOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
+ super(opcode, pp, mmmmm, w, op, assertion);
+ }
+
+ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2) {
+ assert assertion.check((AMD64) asm.target.arch, LZ, dst, src2, src1, null);
+ assert size == AVXSize.DWORD || size == AVXSize.QWORD;
+ asm.vexPrefix(dst, src2, src1, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1);
+ asm.emitByte(op);
+ asm.emitModRM(dst, src1);
+ }
+
+ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src1, Register src2) {
+ assert assertion.check((AMD64) asm.target.arch, LZ, dst, src2, null, null);
+ assert size == AVXSize.DWORD || size == AVXSize.QWORD;
+ asm.vexPrefix(dst, src2, src1, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1);
+ asm.emitByte(op);
+ asm.emitOperandHelper(dst, src1, 0);
+ }
+ }
+
/**
* VEX-encoded shift instructions with an operand order of either RVM or VMI.
*/
@@ -1349,7 +1411,7 @@
private final int r;
private VexShiftOp(String opcode, int pp, int mmmmm, int w, int op, int immOp, int r) {
- super(opcode, pp, mmmmm, w, op, AVXOpAssertion.AVX1_2);
+ super(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1_2);
this.immOp = immOp;
this.r = r;
}
@@ -1368,17 +1430,17 @@
// @formatter:off
public static final VexMaskMoveOp VMASKMOVPS = new VexMaskMoveOp("VMASKMOVPS", P_66, M_0F38, W0, 0x2C, 0x2E);
public static final VexMaskMoveOp VMASKMOVPD = new VexMaskMoveOp("VMASKMOVPD", P_66, M_0F38, W0, 0x2D, 0x2F);
- public static final VexMaskMoveOp VPMASKMOVD = new VexMaskMoveOp("VPMASKMOVD", P_66, M_0F38, W0, 0x8C, 0x8E, AVXOpAssertion.AVX2);
- public static final VexMaskMoveOp VPMASKMOVQ = new VexMaskMoveOp("VPMASKMOVQ", P_66, M_0F38, W1, 0x8C, 0x8E, AVXOpAssertion.AVX2);
+ public static final VexMaskMoveOp VPMASKMOVD = new VexMaskMoveOp("VPMASKMOVD", P_66, M_0F38, W0, 0x8C, 0x8E, VEXOpAssertion.AVX2);
+ public static final VexMaskMoveOp VPMASKMOVQ = new VexMaskMoveOp("VPMASKMOVQ", P_66, M_0F38, W1, 0x8C, 0x8E, VEXOpAssertion.AVX2);
// @formatter:on
private final int opReverse;
private VexMaskMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse) {
- this(opcode, pp, mmmmm, w, op, opReverse, AVXOpAssertion.AVX1);
+ this(opcode, pp, mmmmm, w, op, opReverse, VEXOpAssertion.AVX1);
}
- private VexMaskMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse, AVXOpAssertion assertion) {
+ private VexMaskMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
this.opReverse = opReverse;
}
@@ -1405,15 +1467,15 @@
// @formatter:off
public static final VexRVMIOp VSHUFPS = new VexRVMIOp("VSHUFPS", P_, M_0F, WIG, 0xC6);
public static final VexRVMIOp VSHUFPD = new VexRVMIOp("VSHUFPD", P_66, M_0F, WIG, 0xC6);
- public static final VexRVMIOp VINSERTF128 = new VexRVMIOp("VINSERTF128", P_66, M_0F3A, W0, 0x18, AVXOpAssertion.AVX1_256ONLY);
- public static final VexRVMIOp VINSERTI128 = new VexRVMIOp("VINSERTI128", P_66, M_0F3A, W0, 0x38, AVXOpAssertion.AVX2_256ONLY);
+ public static final VexRVMIOp VINSERTF128 = new VexRVMIOp("VINSERTF128", P_66, M_0F3A, W0, 0x18, VEXOpAssertion.AVX1_256ONLY);
+ public static final VexRVMIOp VINSERTI128 = new VexRVMIOp("VINSERTI128", P_66, M_0F3A, W0, 0x38, VEXOpAssertion.AVX2_256ONLY);
// @formatter:on
private VexRVMIOp(String opcode, int pp, int mmmmm, int w, int op) {
- this(opcode, pp, mmmmm, w, op, AVXOpAssertion.AVX1);
+ this(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1);
}
- private VexRVMIOp(String opcode, int pp, int mmmmm, int w, int op, AVXOpAssertion assertion) {
+ private VexRVMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
super(opcode, pp, mmmmm, w, op, assertion);
}
@@ -1528,7 +1590,7 @@
}
private VexFloatCompareOp(String opcode, int pp, int mmmmm, int w, int op) {
- super(opcode, pp, mmmmm, w, op, AVXOpAssertion.AVX1);
+ super(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1);
}
public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Predicate p) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java Mon Sep 17 09:36:33 2018 -0700
@@ -37,7 +37,7 @@
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z1;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L128;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L256;
-import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LIG;
+import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LZ;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F38;
import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F3A;
@@ -748,7 +748,7 @@
public static final class VEXPrefixConfig {
public static final int L128 = 0;
public static final int L256 = 1;
- public static final int LIG = 0;
+ public static final int LZ = 0;
public static final int W0 = 0;
public static final int W1 = 1;
@@ -849,10 +849,10 @@
protected final void emitVEX(int l, int pp, int mmmmm, int w, int rxb, int vvvv) {
assert ((AMD64) target.arch).getFeatures().contains(CPUFeature.AVX) : "emitting VEX prefix on a CPU without AVX support";
- assert l == L128 || l == L256 || l == LIG : "invalid value for VEX.L";
+ assert l == L128 || l == L256 : "invalid value for VEX.L";
assert pp == P_ || pp == P_66 || pp == P_F3 || pp == P_F2 : "invalid value for VEX.pp";
assert mmmmm == M_0F || mmmmm == M_0F38 || mmmmm == M_0F3A : "invalid value for VEX.m-mmmm";
- assert w == W0 || w == W1 || w == WIG : "invalid value for VEX.W";
+ assert w == W0 || w == W1 : "invalid value for VEX.W";
assert (rxb & 0x07) == rxb : "invalid value for VEX.RXB";
assert (vvvv & 0x0F) == vvvv : "invalid value for VEX.vvvv";
@@ -887,7 +887,7 @@
}
}
- private static int getLFlag(AVXSize size) {
+ public static int getLFlag(AVXSize size) {
switch (size) {
case XMM:
return L128;
@@ -896,7 +896,7 @@
case ZMM:
return L512;
default:
- return LIG;
+ return LZ;
}
}
@@ -910,6 +910,7 @@
protected static final class EVEXPrefixConfig {
public static final int L512 = 2;
+ public static final int LIG = 0;
public static final int Z0 = 0x0;
public static final int Z1 = 0x1;
@@ -1013,10 +1014,10 @@
private void emitEVEX(int l, int pp, int mm, int w, int rxb, int reg, int vvvvv, int z, int b, int aaa) {
assert ((AMD64) target.arch).getFeatures().contains(CPUFeature.AVX512F) : "emitting EVEX prefix on a CPU without AVX512 support";
- assert l == L128 || l == L256 || l == L512 || l == LIG : "invalid value for EVEX.L'L";
+ assert l == L128 || l == L256 || l == L512 : "invalid value for EVEX.L'L";
assert pp == P_ || pp == P_66 || pp == P_F3 || pp == P_F2 : "invalid value for EVEX.pp";
assert mm == M_0F || mm == M_0F38 || mm == M_0F3A : "invalid value for EVEX.mm";
- assert w == W0 || w == W1 || w == WIG : "invalid value for EVEX.W";
+ assert w == W0 || w == W1 : "invalid value for EVEX.W";
assert (rxb & 0x07) == rxb : "invalid value for EVEX.RXB";
assert (reg & 0x1F) == reg : "invalid value for EVEX.R'";
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java Mon Sep 17 09:36:33 2018 -0700
@@ -41,6 +41,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter;
@@ -279,7 +280,8 @@
executor.execute(() -> {
try (DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER)) {
ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m);
- StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).build();
+ boolean isSubstitution = method.getAnnotation(Snippet.class) != null || method.getAnnotation(MethodSubstitution.class) != null;
+ StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).setIsSubstitution(isSubstitution).build();
try (DebugCloseable s = debug.disableIntercept(); DebugContext.Scope ds = debug.scope("CheckingGraph", graph, method)) {
checkMethod(method);
graphBuilderSuite.apply(graph, context);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NewInstanceTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+
+import org.graalvm.compiler.java.GraphBuilderPhase;
+import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import org.graalvm.compiler.nodes.java.NewInstanceNode;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.phases.OptimisticOptimizations;
+import org.junit.Assert;
+import org.junit.Test;
+
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+public class NewInstanceTest extends GraalCompilerTest {
+ public static class Template {
+ public Object o = new CCCC();
+ }
+
+ /**
+ * 1. Concrete class, should produce normal {@link NewInstanceNode}
+ */
+ public static class CCCC {
+
+ }
+
+ /**
+ * 2. The test will replace references to {@link CCCC} in the {@link Template} to {@link AAAA}
+ */
+ public abstract static class AAAA {
+
+ }
+
+ /**
+ * 3. The test will replace references to {@link CCCC} in the {@link Template} to {@link IIII}
+ */
+ public interface IIII {
+
+ }
+
+ private StructuredGraph parseAndProcess(Class<?> cl) {
+ Constructor<?>[] constructors = cl.getConstructors();
+ Assert.assertTrue(constructors.length == 1);
+ final ResolvedJavaMethod javaMethod = getMetaAccess().lookupJavaMethod(constructors[0]);
+ OptionValues options = getInitialOptions();
+ StructuredGraph graph = new StructuredGraph.Builder(options, getDebugContext(options, null, javaMethod), AllowAssumptions.YES).method(javaMethod).build();
+
+ GraphBuilderConfiguration conf = GraphBuilderConfiguration.getSnippetDefault(getDefaultGraphBuilderPlugins()).withUnresolvedIsError(false);
+ new GraphBuilderPhase.Instance(getMetaAccess(), getProviders().getStampProvider(), getProviders().getConstantReflection(), getProviders().getConstantFieldProvider(), conf,
+ OptimisticOptimizations.ALL, null).apply(graph);
+ return graph;
+ }
+
+ private void checkGraph(Class<?> cl, int newInstanceNodeCount, int deoptimizeNodeCount) {
+ StructuredGraph graph = parseAndProcess(cl);
+ Assert.assertEquals(newInstanceNodeCount, graph.getNodes().filter(NewInstanceNode.class).count());
+ Assert.assertEquals(deoptimizeNodeCount, graph.getNodes().filter(DeoptimizeNode.class).count());
+ }
+
+ /**
+ * Use a custom class loader to generate classes, substitute class names at the allocation site.
+ */
+ @Test
+ public void test1() throws ClassNotFoundException {
+ checkGraph(Template.class, 1, 0);
+ ClassTemplateLoader loader1 = new ClassTemplateLoader("CCCC", "AAAA");
+ checkGraph(loader1.findClass("Template"), 0, 1);
+ ClassTemplateLoader loader2 = new ClassTemplateLoader("CCCC", "IIII");
+ checkGraph(loader2.findClass("Template"), 0, 1);
+ }
+
+ private static class ClassTemplateLoader extends ClassLoader {
+ private final String find;
+ private final String replace;
+
+ ClassTemplateLoader(String find, String replace) {
+ assert find.length() == replace.length();
+ this.find = find;
+ this.replace = replace;
+ }
+
+ @Override
+ protected Class<?> findClass(final String name) throws ClassNotFoundException {
+ // copy classfile to byte array
+ byte[] classData = null;
+ try {
+ InputStream is = NewInstanceTest.class.getResourceAsStream("NewInstanceTest$" + name + ".class");
+ assert is != null;
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ byte[] buf = new byte[1024];
+ int size;
+ while ((size = is.read(buf, 0, buf.length)) != -1) {
+ baos.write(buf, 0, size);
+ }
+ baos.flush();
+ classData = baos.toByteArray();
+ } catch (IOException e) {
+ Assert.fail("can't access class: " + name);
+ }
+
+ // replace all occurrences of the template in classfile
+ int index = -1;
+ while ((index = indexOfTemplate(classData, index + 1, find)) != -1) {
+ replaceTemplate(classData, index, replace);
+ }
+
+ Class<?> c = defineClass(null, classData, 0, classData.length);
+ return c;
+ }
+
+ private static int indexOfTemplate(byte[] b, int index, String find) {
+ for (int i = index; i < b.length; i++) {
+ boolean match = true;
+ for (int j = i; j < i + find.length(); j++) {
+ if (b[j] != (byte) find.charAt(j - i)) {
+ match = false;
+ break;
+ }
+ }
+ if (match) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ private static void replaceTemplate(byte[] b, int index, String replace) {
+ for (int i = index; i < index + replace.length(); i++) {
+ b[i] = (byte) replace.charAt(i - index);
+ }
+ }
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,6 +27,7 @@
import java.util.List;
import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.iterators.NodeIterable;
import org.graalvm.compiler.loop.DefaultLoopPolicies;
import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase;
import org.graalvm.compiler.loop.phases.LoopPeelingPhase;
@@ -492,4 +493,21 @@
public void testDeoptMonitor() {
test("testDeoptMonitorSnippet", new Object(), 0);
}
+
+ @Test
+ public void testInterfaceArrayAssignment() {
+ prepareGraph("testInterfaceArrayAssignmentSnippet", false);
+ NodeIterable<ReturnNode> returns = graph.getNodes().filter(ReturnNode.class);
+ assertTrue(returns.count() == 1);
+ assertFalse(returns.first().result().isConstant());
+ }
+
+ private interface TestInterface {
+ }
+
+ public static boolean testInterfaceArrayAssignmentSnippet() {
+ Object[] array = new TestInterface[1];
+ array[0] = new Object();
+ return array[0] == null;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java Mon Sep 17 09:36:33 2018 -0700
@@ -41,6 +41,7 @@
import java.io.PrintStream;
import java.util.Map;
+import org.graalvm.compiler.debug.DebugCloseable;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.DiagnosticsOutputDirectory;
import org.graalvm.compiler.debug.PathUtilities;
@@ -181,15 +182,64 @@
actionKey = CompilationFailureAction;
causeType = "failure";
}
- ExceptionAction action = lookupAction(initialOptions, actionKey, cause);
+ synchronized (CompilationFailureAction) {
+ // Serialize all compilation failure handling.
+ // This prevents retry compilation storms and interleaving
+ // of compilation exception messages.
+ // It also allows for reliable testing of CompilationWrapper
+ // by avoiding a race whereby retry compilation output from a
+ // forced crash (i.e., use of GraalCompilerOptions.CrashAt)
+ // is truncated.
- action = adjustAction(initialOptions, actionKey, action);
+ ExceptionAction action = lookupAction(initialOptions, actionKey, cause);
+
+ action = adjustAction(initialOptions, actionKey, action);
+
+ if (action == ExceptionAction.Silent) {
+ return handleException(cause);
+ }
- if (action == ExceptionAction.Silent) {
- return handleException(cause);
- }
+ if (action == ExceptionAction.Print) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try (PrintStream ps = new PrintStream(baos)) {
+ ps.printf("%s: Compilation of %s failed: ", Thread.currentThread(), this);
+ cause.printStackTrace(ps);
+ ps.printf("To disable compilation %s notifications, set %s to %s (e.g., -Dgraal.%s=%s).%n",
+ causeType,
+ actionKey.getName(), ExceptionAction.Silent,
+ actionKey.getName(), ExceptionAction.Silent);
+ ps.printf("To capture more information for diagnosing or reporting a compilation %s, " +
+ "set %s to %s or %s (e.g., -Dgraal.%s=%s).%n",
+ causeType,
+ actionKey.getName(), ExceptionAction.Diagnose,
+ ExceptionAction.ExitVM,
+ actionKey.getName(), ExceptionAction.Diagnose);
+ }
+ TTY.print(baos.toString());
+ return handleException(cause);
+ }
- if (action == ExceptionAction.Print) {
+ // action is Diagnose or ExitVM
+
+ if (Dump.hasBeenSet(initialOptions)) {
+ // If dumping is explicitly enabled, Graal is being debugged
+ // so don't interfere with what the user is expecting to see.
+ return handleException(cause);
+ }
+
+ String dir = this.outputDirectory.getPath();
+ if (dir == null) {
+ return handleException(cause);
+ }
+ String dumpName = PathUtilities.sanitizeFileName(toString());
+ File dumpPath = new File(dir, dumpName);
+ dumpPath.mkdirs();
+ if (!dumpPath.exists()) {
+ TTY.println("Warning: could not create diagnostics directory " + dumpPath);
+ return handleException(cause);
+ }
+
+ String message;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (PrintStream ps = new PrintStream(baos)) {
ps.printf("%s: Compilation of %s failed: ", Thread.currentThread(), this);
@@ -198,63 +248,16 @@
causeType,
actionKey.getName(), ExceptionAction.Silent,
actionKey.getName(), ExceptionAction.Silent);
- ps.printf("To capture more information for diagnosing or reporting a compilation %s, " +
- "set %s to %s or %s (e.g., -Dgraal.%s=%s).%n",
+ ps.printf("To print a message for a compilation %s without retrying the compilation, " +
+ "set %s to %s (e.g., -Dgraal.%s=%s).%n",
causeType,
- actionKey.getName(), ExceptionAction.Diagnose,
- ExceptionAction.ExitVM,
- actionKey.getName(), ExceptionAction.Diagnose);
+ actionKey.getName(), ExceptionAction.Print,
+ actionKey.getName(), ExceptionAction.Print);
+ ps.println("Retrying compilation of " + this);
+ message = baos.toString();
}
- synchronized (CompilationFailureAction) {
- // Synchronize to prevent compilation exception
- // messages from interleaving.
- TTY.println(baos.toString());
- }
- return handleException(cause);
- }
-
- // action is Diagnose or ExitVM
-
- if (Dump.hasBeenSet(initialOptions)) {
- // If dumping is explicitly enabled, Graal is being debugged
- // so don't interfere with what the user is expecting to see.
- return handleException(cause);
- }
- String dir = this.outputDirectory.getPath();
- if (dir == null) {
- return handleException(cause);
- }
- String dumpName = PathUtilities.sanitizeFileName(toString());
- File dumpPath = new File(dir, dumpName);
- dumpPath.mkdirs();
- if (!dumpPath.exists()) {
- TTY.println("Warning: could not create diagnostics directory " + dumpPath);
- return handleException(cause);
- }
-
- String message;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try (PrintStream ps = new PrintStream(baos)) {
- ps.printf("%s: Compilation of %s failed: ", Thread.currentThread(), this);
- cause.printStackTrace(ps);
- ps.printf("To disable compilation %s notifications, set %s to %s (e.g., -Dgraal.%s=%s).%n",
- causeType,
- actionKey.getName(), ExceptionAction.Silent,
- actionKey.getName(), ExceptionAction.Silent);
- ps.printf("To print a message for a compilation %s without retrying the compilation, " +
- "set %s to %s (e.g., -Dgraal.%s=%s).%n",
- causeType,
- actionKey.getName(), ExceptionAction.Print,
- actionKey.getName(), ExceptionAction.Print);
- ps.println("Retrying compilation of " + this);
- message = baos.toString();
- }
-
- synchronized (CompilationFailureAction) {
- // Synchronize here to serialize retry compilations. This
- // mitigates retry compilation storms.
- TTY.println(message);
+ TTY.print(message);
File retryLogFile = new File(dumpPath, "retry.log");
try (PrintStream ps = new PrintStream(new FileOutputStream(retryLogFile))) {
ps.print(message);
@@ -267,7 +270,7 @@
MethodFilter, null,
DumpPath, dumpPath.getPath());
- try (DebugContext retryDebug = createRetryDebugContext(retryOptions)) {
+ try (DebugContext retryDebug = createRetryDebugContext(retryOptions); DebugCloseable s = retryDebug.disableIntercept()) {
T res = performCompilation(retryDebug);
maybeExitVM(action);
return res;
@@ -283,16 +286,8 @@
private void maybeExitVM(ExceptionAction action) {
if (action == ExitVM) {
- synchronized (ExceptionAction.class) {
- try {
- // Give other compiler threads a chance to flush
- // error handling output.
- ExceptionAction.class.wait(2000);
- } catch (InterruptedException e) {
- }
- TTY.println("Exiting VM after retry compilation of " + this);
- System.exit(-1);
- }
+ TTY.println("Exiting VM after retry compilation of " + this);
+ System.exit(-1);
}
}
@@ -303,22 +298,24 @@
private ExceptionAction adjustAction(OptionValues initialOptions, EnumOptionKey<ExceptionAction> actionKey, ExceptionAction initialAction) {
ExceptionAction action = initialAction;
int maxProblems = MaxCompilationProblemsPerAction.getValue(initialOptions);
- synchronized (problemsHandledPerAction) {
- while (action != ExceptionAction.Silent) {
- int problems = problemsHandledPerAction.getOrDefault(action, 0);
- if (problems >= maxProblems) {
- if (problems == maxProblems) {
- TTY.printf("Warning: adjusting %s from %s to %s after %s (%d) failed compilations%n", actionKey, action, action.quieter(),
- MaxCompilationProblemsPerAction, maxProblems);
- // Ensure that the message above is only printed once
- problemsHandledPerAction.put(action, problems + 1);
+ if (action != ExceptionAction.ExitVM) {
+ synchronized (problemsHandledPerAction) {
+ while (action != ExceptionAction.Silent) {
+ int problems = problemsHandledPerAction.getOrDefault(action, 0);
+ if (problems >= maxProblems) {
+ if (problems == maxProblems) {
+ TTY.printf("Warning: adjusting %s from %s to %s after %s (%d) failed compilations%n", actionKey, action, action.quieter(),
+ MaxCompilationProblemsPerAction, maxProblems);
+ // Ensure that the message above is only printed once
+ problemsHandledPerAction.put(action, problems + 1);
+ }
+ action = action.quieter();
+ } else {
+ break;
}
- action = action.quieter();
- } else {
- break;
}
+ problemsHandledPerAction.put(action, problemsHandledPerAction.getOrDefault(action, 0) + 1);
}
- problemsHandledPerAction.put(action, problemsHandledPerAction.getOrDefault(action, 0) + 1);
}
return action;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java Mon Sep 17 09:36:33 2018 -0700
@@ -50,7 +50,8 @@
"The accepted values are the same as for CompilationBailoutAction.", type = OptionType.User)
public static final EnumOptionKey<ExceptionAction> CompilationFailureAction = new EnumOptionKey<>(ExceptionAction.Diagnose);
@Option(help = "The maximum number of compilation failures or bailouts to handle with the action specified " +
- "by CompilationFailureAction or CompilationBailoutAction before changing to a less verbose action.", type = OptionType.User)
+ "by CompilationFailureAction or CompilationBailoutAction before changing to a less verbose action. " +
+ "This does not apply to the ExitVM action.", type = OptionType.User)
public static final OptionKey<Integer> MaxCompilationProblemsPerAction = new OptionKey<>(2);
@Option(help = "Alias for CompilationFailureAction=ExitVM.", type = OptionType.User)
public static final OptionKey<Boolean> ExitVMOnException = new OptionKey<>(false);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,14 +27,16 @@
import static org.graalvm.compiler.debug.DebugContext.NO_DESCRIPTION;
import static org.graalvm.compiler.debug.DebugContext.NO_GLOBAL_METRIC_VALUES;
+import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.Formatter;
import java.util.List;
+import java.util.stream.Collectors;
import jdk.internal.vm.compiler.collections.EconomicMap;
import org.graalvm.compiler.debug.Assertions;
@@ -158,14 +160,13 @@
}
}
}
- DataInputStream in = new DataInputStream(getClass().getResourceAsStream(getClass().getSimpleName() + ".testLogging.input"));
- byte[] buf = new byte[in.available()];
- in.readFully(buf);
- String threadLabel = "[thread:" + Thread.currentThread().getId() + "]";
- String expect = new String(buf).replace("[thread:1]", threadLabel);
-
- String log = setup.logOutput.toString();
- Assert.assertEquals(expect, log);
+ String expected;
+ try (BufferedReader input = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream(getClass().getSimpleName() + ".testLogging.input")))) {
+ String threadLabel = "[thread:" + Thread.currentThread().getId() + "]";
+ expected = input.lines().collect(Collectors.joining(System.lineSeparator(), "", System.lineSeparator())).replace("[thread:1]", threadLabel);
+ }
+ String logged = setup.logOutput.toString();
+ Assert.assertEquals(expected, logged);
}
@Test
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java Mon Sep 17 09:36:33 2018 -0700
@@ -84,7 +84,10 @@
}
}
}
- return CLOSED.equals(path) ? null : path;
+ if (CLOSED.equals(path)) {
+ TTY.println("Warning: Graal diagnostic directory already closed");
+ }
+ return path;
}
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,8 +24,11 @@
package org.graalvm.compiler.debug;
+import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
+
import java.io.File;
import java.io.IOException;
+import java.nio.file.AccessDeniedException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
@@ -118,7 +121,15 @@
if (createDirectory) {
return Files.createDirectory(result);
} else {
- return Files.createFile(result);
+ try {
+ return Files.createFile(result);
+ } catch (AccessDeniedException e) {
+ /*
+ * Thrown on Windows if a directory with the same name already exists, so
+ * convert it to FileAlreadyExistsException if that's the case.
+ */
+ throw Files.isDirectory(result, NOFOLLOW_LINKS) ? new FileAlreadyExistsException(e.getFile()) : e;
+ }
}
} catch (FileAlreadyExistsException e) {
uniqueTag = "_" + dumpCounter++;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -54,11 +54,13 @@
*/
@Test
public void testVMCompilation1() throws IOException, InterruptedException {
- testHelper(Collections.emptyList(), Arrays.asList("-XX:+BootstrapJVMCI",
+ testHelper(Collections.emptyList(), Arrays.asList("-XX:-TieredCompilation",
"-XX:+UseJVMCICompiler",
"-Dgraal.CompilationFailureAction=ExitVM",
- "-Dgraal.CrashAt=Object.*,String.*",
- "-version"));
+ "-Dgraal.CrashAt=TestProgram.*",
+ "-Xcomp",
+ "-XX:CompileCommand=compileonly,*/TestProgram.print*",
+ TestProgram.class.getName()));
}
/**
@@ -67,11 +69,13 @@
*/
@Test
public void testVMCompilation2() throws IOException, InterruptedException {
- testHelper(Collections.emptyList(), Arrays.asList("-XX:+BootstrapJVMCI",
+ testHelper(Collections.emptyList(), Arrays.asList("-XX:-TieredCompilation",
"-XX:+UseJVMCICompiler",
"-Dgraal.ExitVMOnException=true",
- "-Dgraal.CrashAt=Object.*,String.*",
- "-version"));
+ "-Dgraal.CrashAt=TestProgram.*",
+ "-Xcomp",
+ "-XX:CompileCommand=compileonly,*/TestProgram.print*",
+ TestProgram.class.getName()));
}
static class Probe {
@@ -105,23 +109,36 @@
*/
@Test
public void testVMCompilation3() throws IOException, InterruptedException {
- final int maxProblems = 4;
+ final int maxProblems = 2;
+ Probe retryingProbe = new Probe("Retrying compilation of", maxProblems) {
+ @Override
+ String test() {
+ return actualOccurrences > 0 && actualOccurrences <= maxProblems ? null : String.format("expected occurrences to be in [1 .. %d]", maxProblems);
+ }
+ };
+ Probe adjustmentProbe = new Probe("adjusting CompilationFailureAction from Diagnose to Print", 1) {
+ @Override
+ String test() {
+ if (retryingProbe.actualOccurrences >= maxProblems) {
+ if (actualOccurrences == 0) {
+ return "expected at least one occurrence";
+ }
+ }
+ return null;
+ }
+ };
Probe[] probes = {
- new Probe("Retrying compilation of", maxProblems) {
- @Override
- String test() {
- return actualOccurrences > 0 && actualOccurrences <= maxProblems ? null : String.format("expected occurrences to be in [1 .. %d]", maxProblems);
- }
- },
- new Probe("adjusting CompilationFailureAction from Diagnose to Print", 1),
- new Probe("adjusting CompilationFailureAction from Print to Silent", 1),
+ retryingProbe,
+ adjustmentProbe
};
- testHelper(Arrays.asList(probes), Arrays.asList("-XX:+BootstrapJVMCI",
+ testHelper(Arrays.asList(probes), Arrays.asList("-XX:-TieredCompilation",
"-XX:+UseJVMCICompiler",
"-Dgraal.CompilationFailureAction=Diagnose",
"-Dgraal.MaxCompilationProblemsPerAction=" + maxProblems,
- "-Dgraal.CrashAt=Object.*,String.*",
- "-version"));
+ "-Dgraal.CrashAt=TestProgram.*",
+ "-Xcomp",
+ "-XX:CompileCommand=compileonly,*/TestProgram.print*",
+ TestProgram.class.getName()));
}
/**
@@ -246,3 +263,38 @@
}
}
}
+
+class TestProgram {
+ public static void main(String[] args) {
+ printHello1();
+ printWorld1();
+ printHello2();
+ printWorld2();
+ printHello3();
+ printWorld3();
+ }
+
+ private static void printHello1() {
+ System.out.println("Hello1");
+ }
+
+ private static void printWorld1() {
+ System.out.println("World1");
+ }
+
+ private static void printHello2() {
+ System.out.println("Hello2");
+ }
+
+ private static void printWorld2() {
+ System.out.println("World2");
+ }
+
+ private static void printHello3() {
+ System.out.println("Hello3");
+ }
+
+ private static void printWorld3() {
+ System.out.println("World3");
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,9 +28,6 @@
import org.junit.Assert;
import org.junit.Test;
-import jdk.vm.ci.meta.ProfilingInfo;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
/**
* Test on-stack-replacement with Graal. The test manually triggers a Graal OSR-compilation which is
* later invoked when hitting the backedge counter overflow.
@@ -103,58 +100,4 @@
GraalDirectives.controlFlowAnchor();
return ret;
}
-
- @Test
- public void testOSR04() {
- testFunnyOSR("testDoWhile", GraalOSRTest::testDoWhile);
- }
-
- @Test
- public void testOSR05() {
- testFunnyOSR("testDoWhileLocked", GraalOSRTest::testDoWhileLocked);
- }
-
- /**
- * Because of a bug in C1 profile collection HotSpot can sometimes request an OSR compilation
- * for a backedge which isn't ever taken. This test synthetically creates that situation.
- */
- private void testFunnyOSR(String name, Runnable warmup) {
- ResolvedJavaMethod method = getResolvedJavaMethod(name);
- int iterations = 0;
- while (true) {
- ProfilingInfo profilingInfo = method.getProfilingInfo();
- if (profilingInfo.isMature()) {
- break;
- }
-
- warmup.run();
- if (iterations++ % 1000 == 0) {
- System.err.print('.');
- }
- if (iterations > 200000) {
- throw new AssertionError("no profile");
- }
- }
- compileOSR(getInitialOptions(), method);
- Result result = executeExpected(method, null);
- checkResult(result);
- }
-
- private static boolean repeatLoop;
-
- public static ReturnValue testDoWhile() {
- do {
- sideEffect++;
- } while (repeatLoop);
- return ReturnValue.SUCCESS;
- }
-
- public static synchronized ReturnValue testDoWhileLocked() {
- // synchronized (GraalOSRTest.class) {
- do {
- sideEffect++;
- } while (repeatLoop);
- // }
- return ReturnValue.SUCCESS;
- }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalManagementTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalManagementTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -358,14 +358,17 @@
assertNotNull("Info is found", info);
final MBeanOperationInfo[] arr = info.getOperations();
- assertEquals("Currently three overloads", 3, arr.length);
MBeanOperationInfo dumpOp = null;
+ int dumpMethodCount = 0;
for (int i = 0; i < arr.length; i++) {
- assertEquals("dumpMethod", arr[i].getName());
- if (arr[i].getSignature().length == 3) {
- dumpOp = arr[i];
+ if ("dumpMethod".equals(arr[i].getName())) {
+ if (arr[i].getSignature().length == 3) {
+ dumpOp = arr[i];
+ }
+ dumpMethodCount++;
}
}
+ assertEquals("Currently three overloads", 3, dumpMethodCount);
assertNotNull("three args variant (as used by VisualVM) found", dumpOp);
MBeanAttributeInfo dumpPath = findAttributeInfo("DumpPath", info);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java Mon Sep 17 09:36:33 2018 -0700
@@ -26,6 +26,10 @@
import java.util.EnumSet;
+import jdk.internal.vm.compiler.collections.EconomicMap;
+import jdk.internal.vm.compiler.collections.EconomicSet;
+import jdk.internal.vm.compiler.collections.Equivalence;
+import jdk.internal.vm.compiler.collections.MapCursor;
import org.graalvm.compiler.code.CompilationResult;
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
@@ -66,10 +70,6 @@
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.tiers.SuitesProvider;
import org.graalvm.compiler.word.Word;
-import jdk.internal.vm.compiler.collections.EconomicMap;
-import jdk.internal.vm.compiler.collections.EconomicSet;
-import jdk.internal.vm.compiler.collections.Equivalence;
-import jdk.internal.vm.compiler.collections.MapCursor;
import jdk.internal.vm.compiler.word.Pointer;
import jdk.vm.ci.code.CompilationRequest;
@@ -286,7 +286,7 @@
/**
* New array stub.
*/
- public static final ForeignCallDescriptor NEW_ARRAY = new ForeignCallDescriptor("new_array", Object.class, KlassPointer.class, int.class, boolean.class);
+ public static final ForeignCallDescriptor NEW_ARRAY = new ForeignCallDescriptor("new_array", Object.class, KlassPointer.class, int.class);
/**
* New instance stub.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java Mon Sep 17 09:36:33 2018 -0700
@@ -227,6 +227,7 @@
method(substMethod).
compilationId(compilationId).
recordInlinedMethods(bytecodeProvider.shouldRecordMethodDependencies()).
+ setIsSubstitution(true).
build();
// @formatter:on
try (DebugContext.Scope scope = debug.scope("GetIntrinsicGraph", graph)) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java Mon Sep 17 09:36:33 2018 -0700
@@ -93,7 +93,8 @@
DiagnosticsOutputDirectory getOutputDirectory();
/**
- * Gets the map used to count compilation problems at each {@link ExceptionAction} level.
+ * Gets the map used to count compilation problems at each {@link ExceptionAction} level. All
+ * updates and queries to the map should be synchronized.
*/
Map<ExceptionAction, Integer> getCompilationProblemsPerAction();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java Mon Sep 17 09:36:33 2018 -0700
@@ -131,7 +131,7 @@
return;
}
} else {
- // Graal is compatible with all JDK versions as of 9 GA.
+ // Graal is compatible with all JDK versions as of 11 GA.
}
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java Mon Sep 17 09:36:33 2018 -0700
@@ -85,8 +85,6 @@
import static org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.G1WBPRECALL;
import static org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.VALIDATE_OBJECT;
import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC;
-import static org.graalvm.compiler.hotspot.stubs.NewArrayStub.NEW_ARRAY_C;
-import static org.graalvm.compiler.hotspot.stubs.NewInstanceStub.NEW_INSTANCE_C;
import static org.graalvm.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C;
import static org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS;
import static org.graalvm.compiler.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER;
@@ -119,8 +117,6 @@
import org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub;
import org.graalvm.compiler.hotspot.stubs.IntegerExactOverflowExceptionStub;
import org.graalvm.compiler.hotspot.stubs.LongExactOverflowExceptionStub;
-import org.graalvm.compiler.hotspot.stubs.NewArrayStub;
-import org.graalvm.compiler.hotspot.stubs.NewInstanceStub;
import org.graalvm.compiler.hotspot.stubs.NullPointerExceptionStub;
import org.graalvm.compiler.hotspot.stubs.OutOfBoundsExceptionStub;
import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -280,8 +276,6 @@
registerForeignCall(EXCEPTION_HANDLER_FOR_PC, c.exceptionHandlerForPcAddress, NativeCall, DESTROYS_REGISTERS, SAFEPOINT, REEXECUTABLE, any());
registerForeignCall(EXCEPTION_HANDLER_FOR_RETURN_ADDRESS, c.exceptionHandlerForReturnAddressAddress, NativeCall, DESTROYS_REGISTERS, SAFEPOINT, REEXECUTABLE, any());
- registerForeignCall(NEW_ARRAY_C, c.newArrayAddress, NativeCall, DESTROYS_REGISTERS, SAFEPOINT, REEXECUTABLE, any());
- registerForeignCall(NEW_INSTANCE_C, c.newInstanceAddress, NativeCall, DESTROYS_REGISTERS, SAFEPOINT, REEXECUTABLE, any());
CreateExceptionStub.registerForeignCalls(c, this);
@@ -292,8 +286,8 @@
registerForeignCall(VM_MESSAGE_C, c.vmMessageAddress, NativeCall, DESTROYS_REGISTERS, SAFEPOINT, REEXECUTABLE, NO_LOCATIONS);
registerForeignCall(ASSERTION_VM_MESSAGE_C, c.vmMessageAddress, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- link(new NewInstanceStub(options, providers, registerStubCall(NEW_INSTANCE, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION)));
- link(new NewArrayStub(options, providers, registerStubCall(NEW_ARRAY, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION)));
+ linkForeignCall(options, providers, NEW_INSTANCE, c.newInstanceAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION);
+ linkForeignCall(options, providers, NEW_ARRAY, c.newArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION);
link(new ExceptionHandlerStub(options, providers, foreignCalls.get(EXCEPTION_HANDLER)));
link(new UnwindExceptionToCallerStub(options, providers, registerStubCall(UNWIND_EXCEPTION_TO_CALLER, SAFEPOINT, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any())));
link(new VerifyOopStub(options, providers, registerStubCall(VERIFY_OOP, LEAF_NOFP, REEXECUTABLE, NO_LOCATIONS)));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java Mon Sep 17 09:36:33 2018 -0700
@@ -331,14 +331,14 @@
}
result = formatArray(hub, allocationSize, length, headerSize, top, prototypeMarkWord, fillContents, maybeUnroll, counters);
} else {
- result = newArray(HotSpotBackend.NEW_ARRAY, hub, length, fillContents);
+ result = newArray(HotSpotBackend.NEW_ARRAY, hub, length);
}
profileAllocation("array", allocationSize, typeContext, options);
return result;
}
@NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true)
- public static native Object newArray(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int length, boolean fillContents);
+ public static native Object newArray(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int length);
public static final ForeignCallDescriptor DYNAMIC_NEW_ARRAY = new ForeignCallDescriptor("dynamic_new_array", Object.class, Class.class, int.class);
public static final ForeignCallDescriptor DYNAMIC_NEW_INSTANCE = new ForeignCallDescriptor("dynamic_new_instance", Object.class, Class.class);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.hotspot.stubs;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayAllocationSize;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.getAndClearObjectResult;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperElementTypeMask;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperElementTypeShift;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeMask;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeShift;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeMask;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeShift;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readLayoutHelper;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.handlePendingException;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.newDescriptor;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.printf;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.verifyObject;
-
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode;
-import org.graalvm.compiler.hotspot.replacements.NewObjectSnippets;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.Word;
-
-import jdk.vm.ci.code.Register;
-
-/**
- * Stub implementing the fast path for TLAB refill during instance class allocation. This stub is
- * called from the {@linkplain NewObjectSnippets inline} allocation code when TLAB allocation fails.
- * If this stub fails to refill the TLAB or allocate the object, it calls out to the HotSpot C++
- * runtime to complete the allocation.
- */
-public class NewArrayStub extends SnippetStub {
-
- public NewArrayStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
- super("newArray", options, providers, linkage);
- }
-
- @Override
- protected Object[] makeConstArgs() {
- int count = method.getSignature().getParameterCount(false);
- Object[] args = new Object[count];
- assert checkConstArg(2, "threadRegister");
- assert checkConstArg(3, "options");
- args[2] = providers.getRegisters().getThreadRegister();
- args[3] = options;
- return args;
- }
-
- @Fold
- static boolean logging(OptionValues options) {
- return StubOptions.TraceNewArrayStub.getValue(options);
- }
-
- /**
- * Re-attempts allocation after an initial TLAB allocation failed or was skipped (e.g., due to
- * -XX:-UseTLAB).
- *
- * @param hub the hub of the object to be allocated
- * @param length the length of the array
- */
- @Snippet
- private static Object newArray(KlassPointer hub, int length, @ConstantParameter Register threadRegister, @ConstantParameter OptionValues options) {
- int layoutHelper = readLayoutHelper(hub);
- int log2ElementSize = (layoutHelper >> layoutHelperLog2ElementSizeShift(INJECTED_VMCONFIG)) & layoutHelperLog2ElementSizeMask(INJECTED_VMCONFIG);
- int headerSize = (layoutHelper >> layoutHelperHeaderSizeShift(INJECTED_VMCONFIG)) & layoutHelperHeaderSizeMask(INJECTED_VMCONFIG);
- int elementKind = (layoutHelper >> layoutHelperElementTypeShift(INJECTED_VMCONFIG)) & layoutHelperElementTypeMask(INJECTED_VMCONFIG);
- int sizeInBytes = arrayAllocationSize(length, headerSize, log2ElementSize);
- if (logging(options)) {
- printf("newArray: element kind %d\n", elementKind);
- printf("newArray: array length %d\n", length);
- printf("newArray: array size %d\n", sizeInBytes);
- printf("newArray: hub=%p\n", hub.asWord().rawValue());
- }
-
- Word thread = registerAsWord(threadRegister);
- if (logging(options)) {
- printf("newArray: calling new_array_c\n");
- }
-
- newArrayC(NEW_ARRAY_C, thread, hub, length);
- handlePendingException(thread, true, true);
- return verifyObject(getAndClearObjectResult(thread));
- }
-
- public static final ForeignCallDescriptor NEW_ARRAY_C = newDescriptor(NewArrayStub.class, "newArrayC", void.class, Word.class, KlassPointer.class, int.class);
-
- @NodeIntrinsic(StubForeignCallNode.class)
- public static native void newArrayC(@ConstantNodeParameter ForeignCallDescriptor newArrayC, Word thread, KlassPointer hub, int length);
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.hotspot.stubs;
-
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.getAndClearObjectResult;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.handlePendingException;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.newDescriptor;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.printf;
-import static org.graalvm.compiler.hotspot.stubs.StubUtil.verifyObject;
-
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode;
-import org.graalvm.compiler.hotspot.replacements.NewObjectSnippets;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.Word;
-
-import jdk.vm.ci.code.Register;
-
-/**
- * Stub implementing the fast path for TLAB refill during instance class allocation. This stub is
- * called from the {@linkplain NewObjectSnippets inline} allocation code when TLAB allocation fails.
- * If this stub fails to refill the TLAB or allocate the object, it calls out to the HotSpot C++
- * runtime for to complete the allocation.
- */
-public class NewInstanceStub extends SnippetStub {
-
- public NewInstanceStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
- super("newInstance", options, providers, linkage);
- }
-
- @Override
- protected Object[] makeConstArgs() {
- int count = method.getSignature().getParameterCount(false);
- Object[] args = new Object[count];
- assert checkConstArg(1, "threadRegister");
- assert checkConstArg(2, "options");
- args[1] = providers.getRegisters().getThreadRegister();
- args[2] = options;
- return args;
- }
-
- @Fold
- static boolean logging(OptionValues options) {
- return StubOptions.TraceNewInstanceStub.getValue(options);
- }
-
- /**
- * Re-attempts allocation after an initial TLAB allocation failed or was skipped (e.g., due to
- * -XX:-UseTLAB).
- *
- * @param hub the hub of the object to be allocated
- */
- @Snippet
- private static Object newInstance(KlassPointer hub, @ConstantParameter Register threadRegister, @ConstantParameter OptionValues options) {
- /*
- * The type is known to be an instance so Klass::_layout_helper is the instance size as a
- * raw number
- */
- Word thread = registerAsWord(threadRegister);
- if (logging(options)) {
- printf("newInstance: calling new_instance_c\n");
- }
-
- newInstanceC(NEW_INSTANCE_C, thread, hub);
- handlePendingException(thread, true, true);
- return verifyObject(getAndClearObjectResult(thread));
- }
-
- @Fold
- static boolean forceSlowPath(OptionValues options) {
- return StubOptions.ForceUseOfNewInstanceStub.getValue(options);
- }
-
- public static final ForeignCallDescriptor NEW_INSTANCE_C = newDescriptor(NewInstanceStub.class, "newInstanceC", void.class, Word.class, KlassPointer.class);
-
- @NodeIntrinsic(StubForeignCallNode.class)
- public static native void newInstanceC(@ConstantNodeParameter ForeignCallDescriptor newInstanceC, Word thread, KlassPointer hub);
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java Mon Sep 17 09:36:33 2018 -0700
@@ -107,9 +107,15 @@
plugins.prependParameterPlugin(new ConstantBindingParameterPlugin(makeConstArgs(), metaAccess, snippetReflection));
GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
+ // @formatter:off
// Stubs cannot have optimistic assumptions since they have
// to be valid for the entire run of the VM.
- final StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).compilationId(compilationId).build();
+ final StructuredGraph graph = new StructuredGraph.Builder(options, debug).
+ method(method).
+ compilationId(compilationId).
+ setIsSubstitution(true).
+ build();
+ // @formatter:on
try (DebugContext.Scope outer = debug.scope("SnippetStub", graph)) {
graph.disableUnsafeAccessTracking();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,8 +25,8 @@
package org.graalvm.compiler.hotspot.stubs;
import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionKey;
//JaCoCo Exclude
@@ -43,14 +43,5 @@
@Option(help = "Trace execution of the stub that routes an exception to a handler in the calling frame.", type = OptionType.Debug)
static final OptionKey<Boolean> TraceUnwindStub = new OptionKey<>(false);
-
- @Option(help = "Trace execution of slow path stub for array allocation.", type = OptionType.Debug)
- static final OptionKey<Boolean> TraceNewArrayStub = new OptionKey<>(false);
-
- @Option(help = "Trace execution of slow path stub for non-array object allocation.", type = OptionType.Debug)
- static final OptionKey<Boolean> TraceNewInstanceStub = new OptionKey<>(false);
-
- @Option(help = "Force non-array object allocation to always use the slow path.", type = OptionType.Debug)
- static final OptionKey<Boolean> ForceUseOfNewInstanceStub = new OptionKey<>(false);
//@formatter:on
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java Mon Sep 17 09:36:33 2018 -0700
@@ -26,6 +26,7 @@
import static org.graalvm.compiler.bytecode.Bytecodes.AALOAD;
import static org.graalvm.compiler.bytecode.Bytecodes.AASTORE;
+import static org.graalvm.compiler.bytecode.Bytecodes.ANEWARRAY;
import static org.graalvm.compiler.bytecode.Bytecodes.ARETURN;
import static org.graalvm.compiler.bytecode.Bytecodes.ARRAYLENGTH;
import static org.graalvm.compiler.bytecode.Bytecodes.ATHROW;
@@ -78,6 +79,8 @@
import static org.graalvm.compiler.bytecode.Bytecodes.LOOKUPSWITCH;
import static org.graalvm.compiler.bytecode.Bytecodes.LREM;
import static org.graalvm.compiler.bytecode.Bytecodes.LRETURN;
+import static org.graalvm.compiler.bytecode.Bytecodes.MULTIANEWARRAY;
+import static org.graalvm.compiler.bytecode.Bytecodes.NEW;
import static org.graalvm.compiler.bytecode.Bytecodes.PUTFIELD;
import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC;
import static org.graalvm.compiler.bytecode.Bytecodes.RET;
@@ -679,10 +682,19 @@
case SALOAD:
case ARRAYLENGTH:
case CHECKCAST:
+ case NEW:
+ case ANEWARRAY:
+ case MULTIANEWARRAY:
case PUTSTATIC:
case GETSTATIC:
case PUTFIELD:
case GETFIELD: {
+ /*
+ * All bytecodes that can trigger lazy class initialization via a
+ * ClassInitializationPlugin (allocations, static field access) must be listed
+ * because the class initializer is allowed to throw an exception, which
+ * requires proper exception handling.
+ */
ExceptionDispatchBlock handler = handleExceptions(blockMap, bci);
if (handler != null) {
current = null;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java Mon Sep 17 09:36:33 2018 -0700
@@ -3369,29 +3369,25 @@
NodeSourcePosition currentPosition = graph.currentNodeSourcePosition();
if (isNeverExecutedCode(probability)) {
- if (!graph.isOSR() || getParent() != null || graph.getEntryBCI() != trueBlock.startBci) {
- NodeSourcePosition survivingSuccessorPosition = graph.trackNodeSourcePosition()
- ? new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), falseBlock.startBci)
- : null;
- append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, true, survivingSuccessorPosition));
- if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
- profilingPlugin.profileGoto(this, method, bci(), falseBlock.startBci, stateBefore);
- }
- appendGoto(falseBlock);
- return;
+ NodeSourcePosition survivingSuccessorPosition = graph.trackNodeSourcePosition()
+ ? new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), falseBlock.startBci)
+ : null;
+ append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, true, survivingSuccessorPosition));
+ if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
+ profilingPlugin.profileGoto(this, method, bci(), falseBlock.startBci, stateBefore);
}
+ appendGoto(falseBlock);
+ return;
} else if (isNeverExecutedCode(1 - probability)) {
- if (!graph.isOSR() || getParent() != null || graph.getEntryBCI() != falseBlock.startBci) {
- NodeSourcePosition survivingSuccessorPosition = graph.trackNodeSourcePosition()
- ? new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), trueBlock.startBci)
- : null;
- append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, false, survivingSuccessorPosition));
- if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
- profilingPlugin.profileGoto(this, method, bci(), trueBlock.startBci, stateBefore);
- }
- appendGoto(trueBlock);
- return;
+ NodeSourcePosition survivingSuccessorPosition = graph.trackNodeSourcePosition()
+ ? new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), trueBlock.startBci)
+ : null;
+ append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, false, survivingSuccessorPosition));
+ if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
+ profilingPlugin.profileGoto(this, method, bci(), trueBlock.startBci, stateBefore);
}
+ appendGoto(trueBlock);
+ return;
}
if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
@@ -4116,6 +4112,11 @@
return;
}
ResolvedJavaType resolvedType = (ResolvedJavaType) type;
+ if (resolvedType.isAbstract() || resolvedType.isInterface()) {
+ handleUnresolvedNewInstance(type);
+ return;
+ }
+
ClassInitializationPlugin classInitializationPlugin = graphBuilderConfig.getPlugins().getClassInitializationPlugin();
if (!resolvedType.isInitialized() && classInitializationPlugin == null) {
handleUnresolvedNewInstance(type);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java Mon Sep 17 09:36:33 2018 -0700
@@ -436,7 +436,12 @@
@SuppressWarnings("try")
public static boolean verifyEncoding(StructuredGraph originalGraph, EncodedGraph encodedGraph, Architecture architecture) {
DebugContext debug = originalGraph.getDebug();
- StructuredGraph decodedGraph = new StructuredGraph.Builder(originalGraph.getOptions(), debug, AllowAssumptions.YES).method(originalGraph.method()).build();
+ // @formatter:off
+ StructuredGraph decodedGraph = new StructuredGraph.Builder(originalGraph.getOptions(), debug, AllowAssumptions.YES).
+ method(originalGraph.method()).
+ setIsSubstitution(originalGraph.isSubstitution()).
+ build();
+ // @formatter:off
if (originalGraph.trackNodeSourcePosition()) {
decodedGraph.setTrackNodeSourcePosition();
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java Mon Sep 17 09:36:33 2018 -0700
@@ -40,6 +40,8 @@
import jdk.internal.vm.compiler.collections.EconomicSet;
import jdk.internal.vm.compiler.collections.Equivalence;
import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.core.common.CancellationBailoutException;
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.GraalOptions;
@@ -187,6 +189,7 @@
private Cancellable cancellable = null;
private final DebugContext debug;
private NodeSourcePosition callerContext;
+ private boolean isSubstitution;
/**
* Creates a builder for a graph.
@@ -217,6 +220,14 @@
return this;
}
+ /**
+ * @see StructuredGraph#isSubstitution
+ */
+ public Builder setIsSubstitution(boolean flag) {
+ this.isSubstitution = flag;
+ return this;
+ }
+
public ResolvedJavaMethod getMethod() {
return rootMethod;
}
@@ -303,8 +314,22 @@
public StructuredGraph build() {
List<ResolvedJavaMethod> inlinedMethods = recordInlinedMethods ? new ArrayList<>() : null;
- return new StructuredGraph(name, rootMethod, entryBCI, assumptions, speculationLog, useProfilingInfo, inlinedMethods,
- trackNodeSourcePosition, compilationId, options, debug, cancellable, callerContext);
+ // @formatter:off
+ return new StructuredGraph(name,
+ rootMethod,
+ entryBCI,
+ assumptions,
+ speculationLog,
+ useProfilingInfo,
+ isSubstitution,
+ inlinedMethods,
+ trackNodeSourcePosition,
+ compilationId,
+ options,
+ debug,
+ cancellable,
+ callerContext);
+ // @formatter:on
}
}
@@ -323,6 +348,8 @@
private boolean isAfterExpandLogic = false;
private final boolean useProfilingInfo;
private final Cancellable cancellable;
+ private final boolean isSubstitution;
+
/**
* The assumptions made while constructing and transforming this graph.
*/
@@ -369,6 +396,7 @@
Assumptions assumptions,
SpeculationLog speculationLog,
boolean useProfilingInfo,
+ boolean isSubstitution,
List<ResolvedJavaMethod> methods,
SourcePositionTracking trackNodeSourcePosition,
CompilationIdentifier compilationId,
@@ -386,6 +414,8 @@
this.methods = methods;
this.speculationLog = speculationLog;
this.useProfilingInfo = useProfilingInfo;
+ this.isSubstitution = isSubstitution;
+ assert checkIsSubstitutionInvariants(method, isSubstitution);
this.trackNodeSourcePosition = trackNodeSourcePosition;
assert trackNodeSourcePosition != null;
this.cancellable = cancellable;
@@ -393,6 +423,18 @@
this.callerContext = context;
}
+ private static boolean checkIsSubstitutionInvariants(ResolvedJavaMethod method, boolean isSubstitution) {
+ if (method != null) {
+ if (method.getAnnotation(Snippet.class) != null || method.getAnnotation(MethodSubstitution.class) != null) {
+ assert isSubstitution : "Graph for method " + method.format("%H.%n(%p)") +
+ " annotated by " + Snippet.class.getName() + " or " +
+ MethodSubstitution.class.getName() +
+ " must have its `isSubstitution` field set to true";
+ }
+ }
+ return true;
+ }
+
public void setLastSchedule(ScheduleResult result) {
lastSchedule = result;
}
@@ -535,6 +577,7 @@
assumptions == null ? null : new Assumptions(),
speculationLog,
useProfilingInfo,
+ isSubstitution,
methods != null ? new ArrayList<>(methods) : null,
trackNodeSourcePosition,
newCompilationId,
@@ -859,6 +902,15 @@
}
/**
+ * Returns true if this graph is built without parsing the {@linkplain #method() root method} or
+ * if the root method is annotated by {@link Snippet} or {@link MethodSubstitution}. This is
+ * preferred over querying annotations directly as querying annotations can cause class loading.
+ */
+ public boolean isSubstitution() {
+ return isSubstitution;
+ }
+
+ /**
* Gets the profiling info for the {@linkplain #method() root method} of this graph.
*/
public ProfilingInfo getProfilingInfo() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java Mon Sep 17 09:36:33 2018 -0700
@@ -61,7 +61,7 @@
public class InstanceOfNode extends UnaryOpLogicNode implements Lowerable, Virtualizable {
public static final NodeClass<InstanceOfNode> TYPE = NodeClass.create(InstanceOfNode.class);
- private ObjectStamp checkedStamp;
+ private final ObjectStamp checkedStamp;
private JavaTypeProfile profile;
@OptionalInput(Anchor) protected AnchoringNode anchor;
@@ -77,6 +77,7 @@
this.anchor = anchor;
assert (profile == null) || (anchor != null) : "profiles must be anchored";
assert checkedStamp != null;
+ assert type() != null;
}
public static LogicNode createAllowNull(TypeReference type, ValueNode object, JavaTypeProfile profile, AnchoringNode anchor) {
@@ -217,11 +218,6 @@
return checkedStamp;
}
- public void strengthenCheckedStamp(ObjectStamp newCheckedStamp) {
- assert this.checkedStamp.join(newCheckedStamp).equals(newCheckedStamp) : "stamp can only improve";
- this.checkedStamp = newCheckedStamp;
- }
-
@Override
public TriState implies(boolean thisNegated, LogicNode other) {
if (other instanceof InstanceOfNode) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java Mon Sep 17 09:36:33 2018 -0700
@@ -60,7 +60,7 @@
protected NewInstanceNode(NodeClass<? extends NewInstanceNode> c, ResolvedJavaType type, boolean fillContents, FrameState stateBefore) {
super(c, StampFactory.objectNonNull(TypeReference.createExactTrusted(type)), fillContents, stateBefore);
- assert !type.isArray() && !type.isInterface() && !type.isPrimitive();
+ assert !type.isArray() && !type.isInterface() && !type.isPrimitive() && !type.isAbstract();
this.instanceClass = type;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java Mon Sep 17 09:36:33 2018 -0700
@@ -98,7 +98,7 @@
VirtualArrayNode virtual = (VirtualArrayNode) alias;
if (idx >= 0 && idx < virtual.entryCount()) {
ResolvedJavaType componentType = virtual.type().getComponentType();
- if (componentType.isPrimitive() || StampTool.isPointerAlwaysNull(value) || componentType.getSuperclass() == null ||
+ if (componentType.isPrimitive() || StampTool.isPointerAlwaysNull(value) || componentType.isJavaLangObject() ||
(StampTool.typeReferenceOrNull(value) != null && componentType.isAssignableFrom(StampTool.typeOrNull(value)))) {
tool.setVirtualEntry(virtual, idx, value());
tool.delete();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java Mon Sep 17 09:36:33 2018 -0700
@@ -32,7 +32,6 @@
import jdk.internal.vm.compiler.collections.EconomicMap;
import jdk.internal.vm.compiler.collections.MapCursor;
-import org.graalvm.util.CollectionsUtil;
/**
* This class contains methods for parsing Graal options and matching them against a set of
@@ -45,20 +44,21 @@
* {@link OptionDescriptors} providers.
*/
public static Iterable<OptionDescriptors> getOptionsLoader() {
- ServiceLoader<OptionDescriptors> graalLoader = ServiceLoader.load(OptionDescriptors.class, OptionDescriptors.class.getClassLoader());
boolean java8OrEarlier = System.getProperty("java.specification.version").compareTo("1.9") < 0;
+ ClassLoader loader;
if (java8OrEarlier) {
- return graalLoader;
+ // On JDK 8, Graal and its extensions are loaded by same class loader.
+ loader = OptionDescriptors.class.getClassLoader();
} else {
/*
* The Graal module (i.e., jdk.internal.vm.compiler) is loaded by the platform class
- * loader on JDK 9. Other modules that extend Graal or are Graal dependencies (such as
- * Truffle) are supplied via --module-path which means they are loaded by the app class
- * loader. As such, we need to search the app class loader path as well.
+ * loader as of JDK 9. Modules that depend on and extend Graal are loaded by the app
+ * class loader. As such, we need to start the provider search at the app class loader
+ * instead of the platform class loader.
*/
- ServiceLoader<OptionDescriptors> truffleLoader = ServiceLoader.load(OptionDescriptors.class, ClassLoader.getSystemClassLoader());
- return CollectionsUtil.concat(graalLoader, truffleLoader);
+ loader = ClassLoader.getSystemClassLoader();
}
+ return ServiceLoader.load(OptionDescriptors.class, loader);
}
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java Mon Sep 17 09:36:33 2018 -0700
@@ -56,7 +56,6 @@
import org.graalvm.compiler.nodes.AbstractMergeNode;
import org.graalvm.compiler.nodes.BinaryOpLogicNode;
import org.graalvm.compiler.nodes.ConditionAnchorNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
import org.graalvm.compiler.nodes.DeoptimizingGuard;
import org.graalvm.compiler.nodes.EndNode;
import org.graalvm.compiler.nodes.FixedGuardNode;
@@ -64,6 +63,7 @@
import org.graalvm.compiler.nodes.FixedWithNextNode;
import org.graalvm.compiler.nodes.GuardNode;
import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.LogicConstantNode;
import org.graalvm.compiler.nodes.LogicNode;
import org.graalvm.compiler.nodes.LoopExitNode;
import org.graalvm.compiler.nodes.MergeNode;
@@ -335,11 +335,18 @@
if (result != node.isNegated()) {
node.replaceAndDelete(guard.asNode());
} else {
- DeoptimizeNode deopt = node.graph().add(new DeoptimizeNode(node.getAction(), node.getReason(), node.getSpeculation()));
+ /*
+ * Don't kill this branch immediately because `killCFG` can have complex
+ * implications in the presence of loops: it might replace or delete nodes in
+ * other branches or even above the kill point. Instead of killing immediately,
+ * just leave the graph in a state that is easy to simplify by a subsequent
+ * canonicalizer phase.
+ */
+ FixedGuardNode deopt = new FixedGuardNode(LogicConstantNode.forBoolean(result, node.graph()), node.getReason(), node.getAction(), node.getSpeculation(), node.isNegated(),
+ node.getNodeSourcePosition());
AbstractBeginNode beginNode = (AbstractBeginNode) node.getAnchor();
- FixedNode next = beginNode.next();
- beginNode.setNext(deopt);
- GraphUtil.killCFG(next);
+ graph.addAfterFixed(beginNode, node.graph().add(deopt));
+
}
return true;
})) {
@@ -354,10 +361,8 @@
GraphUtil.unlinkFixedNode(node);
GraphUtil.killWithUnusedFloatingInputs(node);
} else {
- DeoptimizeNode deopt = node.graph().add(new DeoptimizeNode(node.getAction(), node.getReason(), node.getSpeculation()));
- deopt.setStateBefore(node.stateBefore());
- node.replaceAtPredecessor(deopt);
- GraphUtil.killCFG(node);
+ node.setCondition(LogicConstantNode.forBoolean(result, node.graph()), node.isNegated());
+ // Don't kill this branch immediately, see `processGuard`.
}
debug.log("Kill fixed guard guard");
return true;
@@ -368,11 +373,10 @@
protected void processIf(IfNode node) {
tryProveCondition(node.condition(), (guard, result, guardedValueStamp, newInput) -> {
+ node.setCondition(LogicConstantNode.forBoolean(result, node.graph()));
AbstractBeginNode survivingSuccessor = node.getSuccessor(result);
survivingSuccessor.replaceAtUsages(InputType.Guard, guard.asNode());
- survivingSuccessor.replaceAtPredecessor(null);
- node.replaceAtPredecessor(survivingSuccessor);
- GraphUtil.killCFG(node);
+ // Don't kill the other branch immediately, see `processGuard`.
counterIfsKilled.increment(debug);
return true;
});
@@ -524,8 +528,7 @@
if (input == null) {
input = valueAt;
}
- ValueNode valueNode = graph.maybeAddOrUnique(PiNode.create(input, curBestStamp, (ValueNode) infoElement.guard));
- valueAt = valueNode;
+ valueAt = graph.maybeAddOrUnique(PiNode.create(input, curBestStamp, (ValueNode) infoElement.guard));
}
newPhi.addInput(valueAt);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java Mon Sep 17 09:36:33 2018 -0700
@@ -41,7 +41,6 @@
import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap;
import jdk.internal.vm.compiler.collections.UnmodifiableMapCursor;
import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
@@ -674,12 +673,12 @@
@SuppressWarnings("try")
private static void updateSourcePositions(Invoke invoke, StructuredGraph inlineGraph, UnmodifiableEconomicMap<Node, Node> duplicates, boolean isSub, Mark mark) {
FixedNode invokeNode = invoke.asNode();
- boolean isSubstitution = isSub || inlineGraph.method().getAnnotation(MethodSubstitution.class) != null || inlineGraph.method().getAnnotation(Snippet.class) != null;
StructuredGraph invokeGraph = invokeNode.graph();
- assert !invokeGraph.trackNodeSourcePosition() || inlineGraph.trackNodeSourcePosition() ||
- isSubstitution : String.format("trackNodeSourcePosition mismatch %s %s != %s %s", invokeGraph, invokeGraph.trackNodeSourcePosition(), inlineGraph,
- inlineGraph.trackNodeSourcePosition());
if (invokeGraph.trackNodeSourcePosition() && invoke.stateAfter() != null) {
+ boolean isSubstitution = isSub || inlineGraph.isSubstitution();
+ assert !invokeGraph.trackNodeSourcePosition() || inlineGraph.trackNodeSourcePosition() ||
+ isSubstitution : String.format("trackNodeSourcePosition mismatch %s %s != %s %s", invokeGraph, invokeGraph.trackNodeSourcePosition(), inlineGraph,
+ inlineGraph.trackNodeSourcePosition());
final NodeSourcePosition invokePos = invoke.asNode().getNodeSourcePosition();
updateSourcePosition(invokeGraph, duplicates, mark, invokePos, isSubstitution);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/jmx/HotSpotMBeanOperationProvider.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.phases.common.jmx;
+
+import java.util.Collection;
+
+public interface HotSpotMBeanOperationProvider {
+ <T> void registerOperations(Class<T> clazz, Collection<? super T> ops);
+
+ Object invoke(String actionName, Object[] params, String[] signature);
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java Mon Sep 17 09:36:33 2018 -0700
@@ -32,6 +32,7 @@
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.MetaAccessProvider;
+import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
public class PhaseContext {
@@ -41,19 +42,22 @@
private final LoweringProvider lowerer;
private final Replacements replacements;
private final StampProvider stampProvider;
+ private final ForeignCallsProvider foreignCalls;
public PhaseContext(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, LoweringProvider lowerer, Replacements replacements,
- StampProvider stampProvider) {
+ StampProvider stampProvider, ForeignCallsProvider foreignCalls) {
this.metaAccess = metaAccess;
this.constantReflection = constantReflection;
this.constantFieldProvider = constantFieldProvider;
this.lowerer = lowerer;
this.replacements = replacements;
this.stampProvider = stampProvider;
+ this.foreignCalls = foreignCalls;
}
public PhaseContext(Providers providers) {
- this(providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getLowerer(), providers.getReplacements(), providers.getStampProvider());
+ this(providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getLowerer(), providers.getReplacements(), providers.getStampProvider(),
+ providers.getForeignCalls());
}
public MetaAccessProvider getMetaAccess() {
@@ -80,4 +84,7 @@
return stampProvider;
}
+ public ForeignCallsProvider getForeignCalls() {
+ return foreignCalls;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -140,7 +140,7 @@
CachingPEGraphDecoder decoder = new CachingPEGraphDecoder(getTarget().arch, targetGraph, getProviders(), graphBuilderConfig, OptimisticOptimizations.NONE, AllowAssumptions.YES,
null, null, new InlineInvokePlugin[]{new InlineAll()}, null, null, null, null);
- decoder.decode(testMethod, false);
+ decoder.decode(testMethod, false, false);
debug.dump(DebugContext.BASIC_LEVEL, targetGraph, "Target Graph");
targetGraph.verify();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java Mon Sep 17 09:36:33 2018 -0700
@@ -83,9 +83,15 @@
}
@SuppressWarnings("try")
- private EncodedGraph createGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider) {
- StructuredGraph graphToEncode = new StructuredGraph.Builder(options, debug, allowAssumptions).useProfilingInfo(false).trackNodeSourcePosition(
- graphBuilderConfig.trackNodeSourcePosition()).method(method).build();
+ private EncodedGraph createGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean isSubstitution) {
+ // @formatter:off
+ StructuredGraph graphToEncode = new StructuredGraph.Builder(options, debug, allowAssumptions).
+ useProfilingInfo(false).
+ trackNodeSourcePosition(graphBuilderConfig.trackNodeSourcePosition()).
+ method(method).
+ setIsSubstitution(isSubstitution).
+ build();
+ // @formatter:on
try (DebugContext.Scope scope = debug.scope("createGraph", graphToEncode)) {
IntrinsicContext initialIntrinsicContext = intrinsicBytecodeProvider != null ? new IntrinsicContext(originalMethod, method, intrinsicBytecodeProvider, INLINE_AFTER_PARSING) : null;
GraphBuilderPhase.Instance graphBuilderPhaseInstance = createGraphBuilderPhaseInstance(initialIntrinsicContext);
@@ -110,10 +116,11 @@
}
@Override
- protected EncodedGraph lookupEncodedGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean trackNodeSourcePosition) {
+ protected EncodedGraph lookupEncodedGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean isSubstitution,
+ boolean trackNodeSourcePosition) {
EncodedGraph result = graphCache.get(method);
if (result == null && method.hasBytecodes()) {
- result = createGraph(method, originalMethod, intrinsicBytecodeProvider);
+ result = createGraph(method, originalMethod, intrinsicBytecodeProvider, isSubstitution);
}
return result;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java Mon Sep 17 09:36:33 2018 -0700
@@ -94,7 +94,7 @@
this.stampProvider = stampProvider;
this.code = code;
this.method = code.getMethod();
- this.graph = new StructuredGraph.Builder(options, debug, allowAssumptions).method(method).build();
+ this.graph = new StructuredGraph.Builder(options, debug, allowAssumptions).method(method).setIsSubstitution(true).build();
this.graph.setTrackNodeSourcePosition();
this.invokeBci = invokeBci;
this.lastInstr = graph.start();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java Mon Sep 17 09:36:33 2018 -0700
@@ -551,8 +551,8 @@
}
}
- public void decode(ResolvedJavaMethod method, boolean trackNodeSourcePosition) {
- PEMethodScope methodScope = new PEMethodScope(graph, null, null, lookupEncodedGraph(method, null, null, trackNodeSourcePosition), method, null, 0, loopExplosionPlugin, null);
+ public void decode(ResolvedJavaMethod method, boolean isSubstitution, boolean trackNodeSourcePosition) {
+ PEMethodScope methodScope = new PEMethodScope(graph, null, null, lookupEncodedGraph(method, null, null, isSubstitution, trackNodeSourcePosition), method, null, 0, loopExplosionPlugin, null);
decode(createInitialLoopScope(methodScope, null));
cleanupGraph(methodScope);
@@ -783,7 +783,9 @@
return null;
}
ResolvedJavaMethod inlineMethod = inlineInfo.getMethodToInline();
- EncodedGraph graphToInline = lookupEncodedGraph(inlineMethod, inlineInfo.getOriginalMethod(), inlineInfo.getIntrinsicBytecodeProvider(), graph.trackNodeSourcePosition());
+ ResolvedJavaMethod originalMethod = inlineInfo.getOriginalMethod();
+ boolean isSubstitution = originalMethod != null && !originalMethod.equals(inlineMethod);
+ EncodedGraph graphToInline = lookupEncodedGraph(inlineMethod, originalMethod, inlineInfo.getIntrinsicBytecodeProvider(), isSubstitution, graph.trackNodeSourcePosition());
if (graphToInline == null) {
return null;
}
@@ -1052,7 +1054,8 @@
}
}
- protected abstract EncodedGraph lookupEncodedGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean trackNodeSourcePosition);
+ protected abstract EncodedGraph lookupEncodedGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean isSubstitution,
+ boolean trackNodeSourcePosition);
@Override
protected void handleFixedNode(MethodScope s, LoopScope loopScope, int nodeOrderId, FixedNode node) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java Mon Sep 17 09:36:33 2018 -0700
@@ -429,10 +429,16 @@
@SuppressWarnings("try")
protected StructuredGraph buildInitialGraph(DebugContext debug, BytecodeProvider bytecodeProvider, final ResolvedJavaMethod methodToParse, Object[] args, boolean trackNodeSourcePosition,
NodeSourcePosition replaceePosition) {
+ // @formatter:off
// Replacements cannot have optimistic assumptions since they have
// to be valid for the entire run of the VM.
- final StructuredGraph graph = new StructuredGraph.Builder(replacements.options, debug).method(methodToParse).trackNodeSourcePosition(trackNodeSourcePosition).callerContext(
- replaceePosition).build();
+ final StructuredGraph graph = new StructuredGraph.Builder(replacements.options, debug).
+ method(methodToParse).
+ trackNodeSourcePosition(trackNodeSourcePosition).
+ callerContext(replaceePosition).
+ setIsSubstitution(true).
+ build();
+ // @formatter:on
// Replacements are not user code so they do not participate in unsafe access
// tracking
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java Mon Sep 17 09:36:33 2018 -0700
@@ -723,7 +723,7 @@
// Copy snippet graph, replacing constant parameters with given arguments
final StructuredGraph snippetCopy = new StructuredGraph.Builder(options, debug).name(snippetGraph.name).method(snippetGraph.method()).trackNodeSourcePosition(
- snippetGraph.trackNodeSourcePosition()).build();
+ snippetGraph.trackNodeSourcePosition()).setIsSubstitution(true).build();
assert !GraalOptions.TrackNodeSourcePosition.getValue(options) || snippetCopy.trackNodeSourcePosition();
if (providers.getCodeCache() != null && providers.getCodeCache().shouldDebugNonSafepoints()) {
snippetCopy.setTrackNodeSourcePosition();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java Mon Sep 17 09:36:33 2018 -0700
@@ -155,7 +155,7 @@
@SuppressWarnings("try")
protected StructuredGraph lowerReplacement(final StructuredGraph replacementGraph, LoweringTool tool) {
final PhaseContext c = new PhaseContext(tool.getMetaAccess(), tool.getConstantReflection(), tool.getConstantFieldProvider(), tool.getLowerer(), tool.getReplacements(),
- tool.getStampProvider());
+ tool.getStampProvider(), null);
if (!graph().hasValueProxies()) {
new RemoveValueProxyPhase().apply(replacementGraph);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java Mon Sep 17 09:36:33 2018 -0700
@@ -211,9 +211,9 @@
* <p>
* Both GraphOutput (the {@code parent} and the returned one) has to be used in
* synchronization - e.g. only one
- * {@link #beginGroup(java.lang.Object, java.lang.String, java.lang.String, java.lang.Object, int, java.util.Map)
- * begin}, {@link #endGroup() end} of group or
- * {@link #print(java.lang.Object, java.util.Map, int, java.lang.String, java.lang.Object...)
+ * {@link GraphOutput#beginGroup(java.lang.Object, java.lang.String, java.lang.String, java.lang.Object, int, java.util.Map)
+ * begin}, {@link GraphOutput#endGroup() end} of group or
+ * {@link GraphOutput#print(java.lang.Object, java.util.Map, int, java.lang.String, java.lang.Object...)
* printing} can be on at a given moment.
*
* @param parent the output to inherit {@code channel} and protocol version from
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js Mon Sep 17 09:36:33 2018 -0700
@@ -132,24 +132,18 @@
} else {
label = item.l;
}
- $li = $("<li/>").appendTo(ul);
+ var li = $("<li/>").appendTo(ul);
if (item.category === catSearchTags) {
if (item.d) {
- $("<a/>").attr("href", "#")
- .html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span><br><span class=\"searchTagDescResult\">"
- + item.d + "</span><br>")
- .appendTo($li);
+ li.html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span><br><span class=\"searchTagDescResult\">"
+ + item.d + "</span><br>");
} else {
- $("<a/>").attr("href", "#")
- .html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span>")
- .appendTo($li);
+ li.html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span>");
}
} else {
- $("<a/>").attr("href", "#")
- .html(label)
- .appendTo($li);
+ li.html(label);
}
- return $li;
+ return li;
}
});
$(function() {
@@ -328,6 +322,7 @@
} else {
window.location.href = pathtoroot + url;
}
+ $("#search").focus();
}
}
});
--- a/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java Mon Sep 17 09:36:33 2018 -0700
@@ -31,6 +31,7 @@
import com.sun.tools.javac.parser.Tokens.Token;
import com.sun.tools.javac.parser.Tokens.TokenKind;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.DiagnosticSource;
import com.sun.tools.javac.util.JCDiagnostic;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -121,6 +122,7 @@
private CaLog(Context context, PrintWriter pw) {
super(context, pw);
+ this.source = DiagnosticSource.NO_SOURCE;
}
@Override
--- a/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java Mon Sep 17 09:36:33 2018 -0700
@@ -67,7 +67,7 @@
private boolean maskModifiers;
// Does the string end with an unclosed '/*' style comment?
- private boolean openComment = false;
+ private boolean openToken = false;
MaskCommentsAndModifiers(String s, boolean maskModifiers) {
this.str = s;
@@ -88,8 +88,8 @@
return sbMask.toString();
}
- boolean endsWithOpenComment() {
- return openComment;
+ boolean endsWithOpenToken() {
+ return openToken;
}
/****** private implementation methods ******/
@@ -142,7 +142,7 @@
private void next() {
switch (c) {
case '\'':
- case '"':
+ case '"': {
maskModifiers = false;
write(c);
int match = c;
@@ -154,6 +154,38 @@
}
write(c); // write match // line-end
break;
+ }
+ case '`': { // RawString
+ maskModifiers = false;
+ int backtickCount = 0;
+ do {
+ write(c);
+ ++backtickCount;
+ read();
+ } while (c == '`');
+ while (true) {
+ if (c == '`') {
+ int cnt = 0;
+ do {
+ write(c);
+ ++cnt;
+ read();
+ } while (c == '`');
+ if (cnt == backtickCount) {
+ unread();
+ break;
+ }
+ } else {
+ write(c);
+ if (c < 0) {
+ openToken = true;
+ break;
+ }
+ read();
+ }
+ }
+ break;
+ }
case '/':
read();
switch (c) {
@@ -166,7 +198,7 @@
prevc = c;
}
writeMask(c);
- openComment = c < 0;
+ openToken = c < 0;
break;
case '/':
writeMask('/');
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java Sat Sep 15 14:03:07 2018 -0700
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,6 @@
package jdk.jshell;
-import jdk.jshell.SourceCodeAnalysis.Completeness;
import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
@@ -170,7 +169,7 @@
@Override
public CompletionInfo analyzeCompletion(String srcInput) {
MaskCommentsAndModifiers mcm = new MaskCommentsAndModifiers(srcInput, false);
- if (mcm.endsWithOpenComment()) {
+ if (mcm.endsWithOpenToken()) {
proc.debug(DBG_COMPA, "Incomplete (open comment): %s\n", srcInput);
return new CompletionInfoImpl(DEFINITELY_INCOMPLETE, null, srcInput + '\n');
}
--- a/test/hotspot/jtreg/TEST.ROOT Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/TEST.ROOT Mon Sep 17 09:36:33 2018 -0700
@@ -56,7 +56,7 @@
vm.hasSAandCanAttach \
vm.hasJFR \
vm.rtm.cpu \
- vm.rtm.os \
+ vm.rtm.compiler \
vm.aot \
vm.cds \
vm.cds.custom.loaders \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/Test8210461.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Cavium (by BELLSOFT). All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8210461
+ * @summary Math cos instrinsic returns incorrect result for large value
+ *
+ * @run main/othervm compiler.intrinsics.math.Test8210461
+ */
+
+package compiler.intrinsics.math;
+
+import java.util.Arrays;
+
+public class Test8210461 {
+ private static final double[] testCases = new double[] {
+ 1647100.0d,
+ 16471000.0d,
+ 164710000.0d
+ };
+
+ public static void main(String[] args) {
+ Arrays.stream(testCases).forEach(Test8210461::test);
+ }
+
+ private static void test(double arg) {
+ double strictResult = StrictMath.cos(arg);
+ double mathResult = Math.cos(arg);
+ if (Math.abs(strictResult - mathResult) > Math.ulp(strictResult))
+ throw new AssertionError(mathResult + " while expecting " + strictResult);
+ }
+}
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
+ * @summary Verify PrintPreciseRTMLockingStatistics on CPUs and OSs with
* rtm support and on VM with rtm locking support,
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify PrintPreciseRTMLockingStatistics on CPUs without
+ * @summary Verify PrintPreciseRTMLockingStatistics on CPUs or OSs without
* rtm support and/or unsupported VM.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires !(vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os)
+ * @requires !vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @build compiler.rtm.cli.TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestRTMAbortThresholdOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMAbortThresholdOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
+ * @requires vm.rtm.compiler
* @run main/othervm compiler.rtm.cli.TestRTMAbortThresholdOption
*/
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
+ * @requires vm.rtm.compiler
* @run main/othervm compiler.rtm.cli.TestRTMLockingCalculationDelayOption
*/
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingThresholdOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMLockingThresholdOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
+ * @requires vm.rtm.compiler
* @run main/othervm compiler.rtm.cli.TestRTMLockingThresholdOption
*/
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestRTMRetryCountOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMRetryCountOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
+ * @requires vm.rtm.compiler
* @run main/othervm compiler.rtm.cli.TestRTMRetryCountOption
*/
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestRTMSpinLoopCountOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMSpinLoopCountOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
+ * @requires vm.rtm.compiler
* @run main/othervm compiler.rtm.cli.TestRTMSpinLoopCountOption
*/
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify RTMTotalCountIncrRate option processing on CPU with
+ * @summary Verify RTMTotalCountIncrRate option processing on CPU and OS with
* rtm support and on VM with rtm locking support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify UseRTMDeopt option processing on CPUs without rtm support
+ * @summary Verify UseRTMDeopt option processing on CPUs or OSs without rtm support
* or on VMs without rtm locking support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires !(vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os)
+ * @requires !vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify UseRTMForStackLocks option processing on CPU with
+ * @summary Verify UseRTMForStackLocks option processing on CPU and OS with
* rtm support when VM supports rtm locking.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify UseRTMForStackLocks option processing on CPUs without
+ * @summary Verify UseRTMForStackLocks option processing on CPUs or OSs without
* rtm support and/or on VMs without rtm locking support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires !(vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os)
+ * @requires !vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify UseRTMLocking option processing on CPU with rtm support and
- * on VM with rtm-locking support.
+ * @summary Verify UseRTMLocking option processing on CPU and OS with rtm support and
+ * on VM with rtm locking support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,12 @@
/**
* @test
* @bug 8031320
- * @summary Verify UseRTMLocking option processing on CPU without
+ * @summary Verify UseRTMLocking option processing on CPUs without
* rtm support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires (!vm.rtm.cpu) & (vm.flavor == "server" & !vm.emulatedClient)
+ * @requires !vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,11 +25,11 @@
* @test
* @bug 8031320
* @summary Verify processing of UseRTMLocking and UseBiasedLocking
- * options combination on CPU and VM with rtm support.
+ * options combination on CPU, OS, and VM with rtm support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
+ * @requires vm.rtm.compiler
* @run main/othervm compiler.rtm.cli.TestUseRTMXendForLockBusyOption
*/
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortRatio.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortThreshold.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAbortThreshold.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Mon Sep 17 09:36:33 2018 -0700
@@ -31,7 +31,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingCalculationDelay.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingCalculationDelay.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMLockingThreshold.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMRetryCount.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMRetryCount.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMSpinLoopCount.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMAfterLockInflation.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMAfterLockInflation.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMDeopt.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMDeopt.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,11 +25,11 @@
* @test
* @bug 8031320
* @summary Verify that UseRTMDeopt affects uncommon trap installation in
- * copmpiled methods with synchronized block.
+ * compiled methods with synchronized block.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForInflatedLocks.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForInflatedLocks.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForStackLocks.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMForStackLocks.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMXendForLockBusy.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/locking/TestUseRTMXendForLockBusy.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/method_options/TestNoRTMLockElidingOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/method_options/TestNoRTMLockElidingOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/method_options/TestUseRTMLockElidingOption.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/method_options/TestUseRTMLockElidingOption.java Mon Sep 17 09:36:33 2018 -0700
@@ -30,7 +30,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java Mon Sep 17 09:36:33 2018 -0700
@@ -31,7 +31,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,6 +23,7 @@
/*
* @test UnloadTest
+ * @bug 8210559
* @requires vm.opt.final.ClassUnloading
* @modules java.base/jdk.internal.misc
* @library /runtime/testlibrary /test/lib
@@ -30,7 +31,7 @@
* @build sun.hotspot.WhiteBox test.Empty
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xlog:class+unload=debug UnloadTest
*/
import sun.hotspot.WhiteBox;
@@ -60,8 +61,16 @@
ClassUnloadCommon.failIf(!wb.isClassAlive(className), "should be live here");
+ String loaderName = cl.getName();
+ int loadedRefcount = wb.getSymbolRefcount(loaderName);
+ System.out.println("Refcount of symbol " + loaderName + " is " + loadedRefcount);
+
cl = null; c = null; o = null;
ClassUnloadCommon.triggerUnloading();
ClassUnloadCommon.failIf(wb.isClassAlive(className), "should have been unloaded");
+
+ int unloadedRefcount = wb.getSymbolRefcount(loaderName);
+ System.out.println("Refcount of symbol " + loaderName + " is " + unloadedRefcount);
+ ClassUnloadCommon.failIf(unloadedRefcount != (loadedRefcount - 1), "Refcount must be decremented");
}
}
--- a/test/hotspot/jtreg/runtime/Dictionary/ProtectionDomainCacheTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/runtime/Dictionary/ProtectionDomainCacheTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,8 @@
* @summary Call Class.forName() on the system classloader from a class loaded
* from a custom classloader, using the current class's protection domain.
* @library /test/jdk/lib/testlibrary
- * @build jdk.testlibrary.Utils JarUtils
+ * @library /test/lib
+ * @build jdk.test.lib.Utils JarUtils
* @build ClassForName ProtectionDomainCacheTest
* @run main/othervm/policy=test.policy -XX:+UnlockDiagnosticVMOptions -XX:VerifySubSet=dictionary -XX:+VerifyAfterGC -Xlog:gc+verify=debug,protectiondomain=trace,class+unload:gc.log -Djava.security.manager ProtectionDomainCacheTest
*/
@@ -39,7 +40,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* Create .jar, load ClassForName from .jar using a URLClassLoader
--- a/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,6 +29,7 @@
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
+ * jdk.jartool/sun.tools.jar
* @run main LongBCP
*/
@@ -84,6 +85,23 @@
output.shouldContain("Hello World")
.shouldHaveExitValue(0);
+ // create a hello.jar
+ sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
+ String helloJar = destDir.toString() + File.separator + "hello.jar";
+ if (!jarTool.run(new String[]
+ {"-cf", helloJar, "-C", destDir.toString(), "Hello.class"})) {
+ throw new RuntimeException("Could not write the Hello jar file");
+ }
+
+ // run with long bootclasspath to hello.jar
+ bootCP = "-Xbootclasspath/a:" + helloJar;
+ pb = ProcessTools.createJavaProcessBuilder(
+ bootCP, "Hello");
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Hello World")
+ .shouldHaveExitValue(0);
+
// relative path tests
// We currently cannot handle relative path specified in the
// -Xbootclasspath/a on windows.
--- a/test/hotspot/jtreg/runtime/testlibrary/ClassUnloadCommon.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/runtime/testlibrary/ClassUnloadCommon.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@
.map(Paths::get)
.map(ClassUnloadCommon::toURL)
.toArray(URL[]::new);
- return new URLClassLoader(urls) {
+ return new URLClassLoader("ClassUnloadCommonClassLoader", urls, new ClassUnloadCommon().getClass().getClassLoader()) {
@Override
public Class<?> loadClass(String cn, boolean resolve)
throws ClassNotFoundException
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002a.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002a.java Mon Sep 17 09:36:33 2018 -0700
@@ -81,7 +81,7 @@
int[] arrVar
)
{
- System.out.println("Arguments but no locals"); // locals002.BREAKPOINT_LINE1
+ int x = 3; // locals002.BREAKPOINT_LINE1
}
static void allKindsOfLocals() {
@@ -97,6 +97,6 @@
int[] arrVar = new int[5];
for (int j = 0; j < 5 ; j++) arrVar[j] = j;
- System.out.println("Locals but no arguments"); // locals002.BREAKPOINT_LINE2
+ int x = 4; // locals002.BREAKPOINT_LINE2
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> add method capability check ...\n");
@@ -145,6 +129,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> delete method capability check ...\n");
@@ -144,6 +128,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> change fields capability check ...\n");
@@ -145,6 +129,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> change implemented interface capability check ...\n");
@@ -145,6 +129,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> change class modifiers capability check ...\n");
@@ -145,6 +129,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> change method modifiers capability check ...\n");
@@ -145,6 +129,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -117,10 +103,8 @@
}
classDef.klass = clazz;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(bytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(bytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> changed class name check ...\n");
@@ -142,6 +126,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "JVMTITools.h"
#include "jni_tools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -311,10 +298,8 @@
jvmtiError err;
classDef.klass = cls;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, classBytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, classBytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(classBytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(classBytes, NULL);
if (printdump == JNI_TRUE) {
printf(">>> about to call RedefineClasses %d\n", redefinesCount);
@@ -615,8 +600,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -713,24 +697,21 @@
!caps.can_get_line_numbers ||
!caps.can_access_local_variables) return;
- classBytes = (jbyteArray) JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG(env, bytes));
+ classBytes = (jbyteArray) env->NewGlobalRef(bytes);
- midRun = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, clazz),
- "run", "()V");
+ midRun = env->GetMethodID(clazz, "run", "()V");
if (midRun == NULL) {
printf("Cannot find Method ID for method run\n");
result = STATUS_FAILED;
}
- mid1 = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, clazz),
- "method1", "(I)V");
+ mid1 = env->GetMethodID(clazz, "method1", "(I)V");
if (mid1 == NULL) {
printf("Cannot find Method ID for method1\n");
result = STATUS_FAILED;
}
- mid2 = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, clazz),
- "method2", "(I)V");
+ mid2 = env->GetMethodID(clazz, "method2", "(I)V");
if (mid2 == NULL) {
printf("Cannot find Method ID for method2\n");
result = STATUS_FAILED;
@@ -755,8 +736,7 @@
}
}
- fid1 = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, clazz),
- "staticInt", "I");
+ fid1 = env->GetStaticFieldID(clazz, "staticInt", "I");
if (fid1 == NULL) {
printf("Cannot find Field ID for staticInt\n");
result = STATUS_FAILED;
@@ -781,8 +761,7 @@
}
}
- fid2 = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, clazz),
- "instanceInt", "I");
+ fid2 = env->GetFieldID(clazz, "instanceInt", "I");
if (fid2 == NULL) {
printf("Cannot find Field ID for instanceInt\n");
result = STATUS_FAILED;
@@ -848,6 +827,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define STATUS_FAILED 2
#define PASSED 0
@@ -90,8 +77,7 @@
jint res;
jvmtiError err;
- if ((res = JNI_ENV_PTR(vm)->GetEnv(JNI_ENV_ARG(vm, (void **) &jvmti),
- JVMTI_VERSION_1_1)) != JNI_OK) {
+ if ((res = vm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1)) != JNI_OK) {
printf("%s: Failed to call GetEnv: error=%d\n", __FILE__, res);
return JNI_ERR;
}
@@ -163,10 +149,8 @@
/* filling the structure jvmtiClassDefinition */
classDef.klass = redefCls;
- classDef.class_byte_count =
- JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, classBytes));
- classDef.class_bytes = (unsigned char *)
- JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, classBytes), NULL);
+ classDef.class_byte_count = env->GetArrayLength(classBytes);
+ classDef.class_bytes = (unsigned char *) env->GetByteArrayElements(classBytes, NULL);
set_watch_ev(1); /* watch JVMTI events */
@@ -201,6 +185,4 @@
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -61,9 +48,9 @@
jmethodID cid;
jthread res;
- thrClass = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG(env, "java/lang/Thread"));
- cid = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, thrClass), "<init>", "()V");
- res = JNI_ENV_PTR(env)->NewObject(JNI_ENV_ARG(env, thrClass), cid);
+ thrClass = env->FindClass("java/lang/Thread");
+ cid = env->GetMethodID(thrClass, "<init>", "()V");
+ res = env->NewObject(thrClass, cid);
return res;
}
@@ -257,8 +244,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -337,6 +323,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -69,8 +56,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -172,6 +158,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -68,8 +55,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -145,6 +131,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -120,8 +106,7 @@
return result;
}
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
+ mid = env->GetStaticMethodID(cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
if (mid == NULL) {
printf("Cannot find method run\n");
return STATUS_FAILED;
@@ -157,6 +142,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -119,8 +105,7 @@
return result;
}
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "check", "()I");
+ mid = env->GetStaticMethodID(cls, "check", "()I");
if (mid == NULL) {
printf("Cannot find method check\n");
return STATUS_FAILED;
@@ -139,6 +124,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -119,8 +105,7 @@
return result;
}
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "trial", "()I");
+ mid = env->GetStaticMethodID(cls, "trial", "()I");
if (mid == NULL) {
printf("Cannot find method trial\n");
return STATUS_FAILED;
@@ -146,6 +131,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -119,8 +105,7 @@
return result;
}
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "checkPoint", "()V");
+ mid = env->GetStaticMethodID(cls, "checkPoint", "()V");
if (mid == 0) {
printf("Cannot find Method ID for method checkPoint\n");
return STATUS_FAILED;
@@ -143,6 +128,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -133,8 +120,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -192,8 +178,7 @@
return;
}
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- exp_name, exp_sig);
+ mid = env->GetStaticMethodID(cls, exp_name, exp_sig);
if (mid == NULL) {
printf("Cannot find Method ID for method checkPoint\n");
result = STATUS_FAILED;
@@ -234,6 +219,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -132,8 +119,7 @@
jfieldID fid;
jmethodID mid;
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "meth01", "(I)V");
+ mid = env->GetStaticMethodID(cls, "meth01", "(I)V");
err = jvmti->SetBreakpoint(mid, 0);
if (err == JVMTI_ERROR_NONE) {
enable(jvmti_env, JVMTI_EVENT_BREAKPOINT);
@@ -143,7 +129,7 @@
TranslateError(err), err);
}
- fid = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls), "fld", "I");
+ fid = env->GetStaticFieldID(cls, "fld", "I");
if (caps.can_generate_field_access_events) {
err = jvmti->SetFieldAccessWatch(cls, fid);
if (err == JVMTI_ERROR_NONE) {
@@ -322,8 +308,7 @@
memset(enbl_scale, 0, SCALE_SIZE);
memset(ev_scale, 0, SCALE_SIZE);
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -429,6 +414,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -74,7 +61,7 @@
jclass cls;
field fld = fields[ind];
- cls = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG(env, fld.klass));
+ cls = env->FindClass(fld.klass);
if (cls == NULL) {
printf("Cannot find class \"%s\"\n", fld.klass);
result = STATUS_FAILED;
@@ -82,11 +69,9 @@
}
if (fld.fid == NULL) {
if (fld.stat) {
- fields[ind].fid = JNI_ENV_PTR(env)->
- GetStaticFieldID(JNI_ENV_ARG(env, cls), fld.name, fld.sig);
+ fields[ind].fid = env->GetStaticFieldID(cls, fld.name, fld.sig);
} else {
- fields[ind].fid = JNI_ENV_PTR(env)->
- GetFieldID(JNI_ENV_ARG(env, cls), fld.name, fld.sig);
+ fields[ind].fid = env->GetFieldID(cls, fld.name, fld.sig);
}
}
@@ -147,8 +132,7 @@
jint res;
jvmtiError err;
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -210,7 +194,7 @@
jint val;
setWatch(env, (jint)0);
- val = JNI_ENV_PTR(env)->GetIntField(JNI_ENV_ARG(env, obj), fields[0].fid);
+ val = env->GetIntField(obj, fields[0].fid);
}
JNIEXPORT void JNICALL
@@ -236,6 +220,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -71,8 +58,7 @@
jint res;
jvmtiError err;
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -127,8 +113,7 @@
jvmtiError err;
jfieldID fid;
- fid = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- "fld1", "I");
+ fid = env->GetStaticFieldID(cls, "fld1", "I");
if (!caps.can_generate_field_access_events) {
err = jvmti->SetFieldAccessWatch(cls, fid);
@@ -170,6 +155,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -83,8 +70,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -135,12 +121,10 @@
return;
}
- fids[0] = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- "fld0", "I");
- fids[1] = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- "fld1", "I");
- fids[2] = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls), "fld2", "I");
- fids[3] = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls), "fld3", "I");
+ fids[0] = env->GetStaticFieldID(cls, "fld0", "I");
+ fids[1] = env->GetStaticFieldID(cls, "fld1", "I");
+ fids[2] = env->GetFieldID(cls, "fld2", "I");
+ fids[3] = env->GetFieldID(cls, "fld3", "I");
for (i = 0; i < sizeof(fids) / sizeof(jfieldID); i++) {
if (fids[i] == NULL) {
printf("Unable to set field access watch on fld%" PRIuPTR ", fieldID=0", i);
@@ -185,6 +169,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -83,8 +70,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -141,12 +127,10 @@
return;
}
- fids[0] = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- "fld0", "I");
- fids[1] = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- "fld1", "I");
- fids[2] = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls), "fld2", "I");
- fids[3] = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls), "fld3", "I");
+ fids[0] = env->GetStaticFieldID(cls, "fld0", "I");
+ fids[1] = env->GetStaticFieldID(cls, "fld1", "I");
+ fids[2] = env->GetFieldID(cls, "fld2", "I");
+ fids[3] = env->GetFieldID(cls, "fld3", "I");
for (i = 0; i < sizeof(fids) / sizeof(jfieldID); i++) {
if (fids[i] == NULL) {
printf("Unable to set field access watch on fld%" PRIuPTR ", fieldID=0", i);
@@ -191,6 +175,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -108,8 +95,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -168,13 +154,9 @@
for (i = 0; i < sizeof(fields) / sizeof(field); i++) {
if (fields[i].stat == JNI_TRUE) {
- fields[i].fid = JNI_ENV_PTR(env)->
- GetStaticFieldID(JNI_ENV_ARG(env, cls),
- fields[i].name, fields[i].sig);
+ fields[i].fid = env->GetStaticFieldID(cls, fields[i].name, fields[i].sig);
} else {
- fields[i].fid = JNI_ENV_PTR(env)->
- GetFieldID(JNI_ENV_ARG(env, cls),
- fields[i].name, fields[i].sig);
+ fields[i].fid = env->GetFieldID(cls, fields[i].name, fields[i].sig);
}
if (fields[i].fid == NULL) {
printf("Unable to set access watch on %s fld%" PRIuPTR ", fieldID=0",
@@ -220,6 +202,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -120,8 +107,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -190,11 +176,9 @@
}
for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) {
if (watches[i].is_static == JNI_TRUE) {
- watches[i].fid = JNI_ENV_PTR(env)->GetStaticFieldID(
- JNI_ENV_ARG(env, cls), watches[i].f_name, watches[i].f_sig);
+ watches[i].fid = env->GetStaticFieldID(cls, watches[i].f_name, watches[i].f_sig);
} else {
- watches[i].fid = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG(env, cls), watches[i].f_name, watches[i].f_sig);
+ watches[i].fid = env->GetFieldID(cls, watches[i].f_name, watches[i].f_sig);
}
err = jvmti->SetFieldAccessWatch(cls, watches[i].fid);
if (err == JVMTI_ERROR_NONE) {
@@ -243,6 +227,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -73,16 +60,12 @@
jclass cls;
jvmtiError err;
- cls = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG(env, fields[ind].klass));
+ cls = env->FindClass(fields[ind].klass);
if (fields[ind].fid == NULL) {
if (fields[ind].stat) {
- fields[ind].fid =
- JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- fields[ind].name, fields[ind].sig);
+ fields[ind].fid = env->GetStaticFieldID(cls, fields[ind].name, fields[ind].sig);
} else {
- fields[ind].fid =
- JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls),
- fields[ind].name, fields[ind].sig);
+ fields[ind].fid = env->GetFieldID(cls, fields[ind].name, fields[ind].sig);
}
}
@@ -143,8 +126,7 @@
jint res;
jvmtiError err;
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -204,7 +186,7 @@
Java_nsk_jvmti_SetFieldModificationWatch_setfmodw001_touchfld0(JNIEnv *env,
jclass cls) {
setWatch(env, (jint)0);
- JNI_ENV_PTR(env)->SetIntField(JNI_ENV_ARG(env, cls), fields[0].fid, (jint)2000);
+ env->SetIntField(cls, fields[0].fid, (jint)2000);
}
JNIEXPORT void JNICALL
@@ -231,6 +213,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -71,8 +58,7 @@
jint res;
jvmtiError err;
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -128,8 +114,7 @@
jvmtiError err;
jfieldID fid;
- fid = JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- "fld1", "I");
+ fid = env->GetStaticFieldID(cls, "fld1", "I");
if (!caps.can_generate_field_modification_events) {
err = jvmti->SetFieldModificationWatch(cls, fid);
@@ -171,6 +156,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -101,8 +88,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -156,13 +142,9 @@
for (i = 0; i < sizeof(flds) / sizeof(field); i++) {
if (flds[i].stat == JNI_TRUE) {
- flds[i].fid =
- JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- flds[i].name, "I");
+ flds[i].fid = env->GetStaticFieldID(cls, flds[i].name, "I");
} else {
- flds[i].fid =
- JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls),
- flds[i].name, "I");
+ flds[i].fid = env->GetFieldID(cls, flds[i].name, "I");
}
if (flds[i].fid == NULL) {
printf("Unable to set field modif. watch on fld%" PRIuPTR ", fieldID=0", i);
@@ -224,6 +206,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -101,8 +88,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -154,13 +140,9 @@
for (i = 0; i < sizeof(flds) / sizeof(field); i++) {
if (flds[i].stat == JNI_TRUE) {
- flds[i].fid =
- JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- flds[i].name, "I");
+ flds[i].fid = env->GetStaticFieldID(cls, flds[i].name, "I");
} else {
- flds[i].fid =
- JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls),
- flds[i].name, "I");
+ flds[i].fid = env->GetFieldID(cls, flds[i].name, "I");
}
if (flds[i].fid == NULL) {
printf("Unable to set field modif. watch on fld%" PRIuPTR ", fieldID=0", i);
@@ -222,6 +204,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -90,9 +77,7 @@
actual_sig = sig;
actual_val = new_value;
if (actual_sig == 'L') {
- actual_val.l =
- JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG((JNIEnv *)env,
- actual_val.l));
+ actual_val.l = env->NewGlobalRef(actual_val.l);
}
if (printdump == JNI_TRUE) {
printf(">>> FieldModification, field: 0x%p", actual_fid);
@@ -152,8 +137,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -216,8 +200,8 @@
flds[3].val.f = 654.321F;
flds[4].val.d = 123456.654321;
flds[5].val.d = 654321.123456;
- flds[6].val.l = JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG(env, obj1));
- flds[7].val.l = JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG(env, obj2));
+ flds[6].val.l = env->NewGlobalRef(obj1);
+ flds[7].val.l = env->NewGlobalRef(obj2);
flds[8].val.z = JNI_TRUE;
flds[9].val.z = JNI_FALSE;
flds[10].val.b = 123;
@@ -228,13 +212,9 @@
flds[15].val.c = 0xdcba;
for (i = 0; i < sizeof(flds) / sizeof(field); i++) {
if (flds[i].stat == JNI_TRUE) {
- flds[i].fid =
- JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- flds[i].name, flds[i].sig);
+ flds[i].fid = env->GetStaticFieldID(cls, flds[i].name, flds[i].sig);
} else {
- flds[i].fid =
- JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls),
- flds[i].name, flds[i].sig);
+ flds[i].fid = env->GetFieldID(cls, flds[i].name, flds[i].sig);
}
if (flds[i].fid == NULL) {
printf("Unable to set modification watch on %s fld%" PRIuPTR ", fieldID=0",
@@ -330,8 +310,7 @@
}
break;
case 'L':
- if (JNI_ENV_PTR(env)->IsSameObject(JNI_ENV_ARG(env, actual_val.l),
- flds[ind].val.l) != JNI_TRUE) {
+ if (!env->IsSameObject(actual_val.l, flds[ind].val.l)) {
result = STATUS_FAILED;
if (!flag_err) {
printf("Field %s fld%d thrown error:\n", flds[ind].descr, ind);
@@ -398,6 +377,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,21 +28,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -120,8 +107,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -184,13 +170,9 @@
}
for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) {
if (watches[i].is_static == JNI_TRUE) {
- watches[i].fid =
- JNI_ENV_PTR(env)->GetStaticFieldID(JNI_ENV_ARG(env, cls),
- watches[i].f_name, watches[i].f_sig);
+ watches[i].fid = env->GetStaticFieldID(cls, watches[i].f_name, watches[i].f_sig);
} else {
- watches[i].fid =
- JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG(env, cls),
- watches[i].f_name, watches[i].f_sig);
+ watches[i].fid = env->GetFieldID(cls, watches[i].f_name, watches[i].f_sig);
}
err = jvmti->SetFieldModificationWatch(cls, watches[i].fid);
if (err == JVMTI_ERROR_NONE) {
@@ -240,6 +222,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -32,27 +32,8 @@
#include "JVMTITools.h"
#include "native_thread.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -140,16 +121,14 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
}
if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) !=
JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get redirected JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
}
if (verbose)
printf("doRedirect: the JNI function table obtained successfully\n");
@@ -163,8 +142,7 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to set new JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
}
if (verbose)
@@ -181,8 +159,7 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to restore original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to restore original JNI function table"));
+ env->FatalError("failed to restore original JNI function table");
}
if (verbose)
printf("doRestore: the original JNI function table is restored successfully\n");
@@ -191,24 +168,22 @@
void doExec(JNIEnv *env, int thrNum) {
jint res;
- if ((res = JNI_ENV_PTR(env)->
- MonitorEnter(JNI_ENV_ARG(env, clsObj))) != 0) {
+ if ((res = env->MonitorEnter(clsObj)) != 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILURE: MonitorEnter() returns %d for thread #%d\n",
__FILE__, __LINE__, res, thrNum);
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILURE: exception occured for thread #%d\n",
__FILE__, __LINE__, thrNum);
- JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionDescribe();
+ env->ExceptionClear();
}
if (verbose)
printf("\ndoExec: thread #%d entered the monitor\n",
thrNum);
- if ((res = JNI_ENV_PTR(env)->
- MonitorExit(JNI_ENV_ARG(env, clsObj))) != 0) {
+ if ((res = env->MonitorExit(clsObj)) != 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILURE: MonitorExit() returns %d for thread #%d\n",
__FILE__, __LINE__, res, thrNum);
@@ -246,9 +221,7 @@
if (verbose)
printf("\nwaitingThread: thread #%d started\n\tattaching the thread to the VM ...\n",
indx);
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
+ if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
printf("(%s,%d): TEST FAILURE: waitingThread: AttachCurrentThread() returns: %d\n",
__FILE__, __LINE__, res);
return STATUS_FAILED;
@@ -258,9 +231,7 @@
doExec(env, indx);
- if ((res =
- JNI_ENV_PTR(vm)->DetachCurrentThread(
- JNI_ENV_ARG1(vm))) != 0) {
+ if ((res = vm->DetachCurrentThread()) != 0) {
printf("(%s,%d): TEST FAILURE: waitingThread: DetachCurrentThread() returns: %d\n",
__FILE__, __LINE__, res);
return STATUS_FAILED;
@@ -276,22 +247,19 @@
jfieldID fid;
jclass _objCls;
- _objCls = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG(env, obj));
+ _objCls = env->GetObjectClass(obj);
if (verbose)
printf("\ngetObjectFromField: obtaining field ID for name=\"%s\" signature=\"%s\"...\n",
javaField, classSig);
- if ((fid = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG(env, _objCls), javaField, classSig)) == 0) {
+ if ((fid = env->GetFieldID(_objCls, javaField, classSig)) == 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILURE: failed to get ID for the field \"%s\"\n",
__FILE__, __LINE__, javaField);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get ID for the java field"));
+ env->FatalError("failed to get ID for the java field");
}
- return JNI_ENV_PTR(env)->GetObjectField(
- JNI_ENV_ARG(env, obj), fid);
+ return env->GetObjectField(obj, fid);
}
void startThreads() {
@@ -358,12 +326,10 @@
return STATUS_FAILED;
}
- if ((clsObj = JNI_ENV_PTR(env)->NewGlobalRef(
- JNI_ENV_ARG(env, getObjectFromField(env, obj)))) == NULL) {
+ if ((clsObj = env->NewGlobalRef(getObjectFromField(env, obj))) == NULL) {
printf("(%s,%d): TEST FAILURE: cannot create a new global reference of class \"%s\"\n",
__FILE__, __LINE__, classSig);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to create a new global reference"));
+ env->FatalError("failed to create a new global reference");
}
doRedirect(env);
@@ -385,18 +351,14 @@
if (verbose)
printf("\nb) Checking the assertion inside main thread detached and attached again ...\n\ndetaching the main thread ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->DetachCurrentThread(
- JNI_ENV_ARG1(vm))) != 0)
+ if ((res = vm->DetachCurrentThread()) != 0)
printf("(%s,%d): Warning: DetachCurrentThread() returns: %d\n\
\tcheck with the detached main thread skipped\n",
__FILE__, __LINE__, res);
else {
if (verbose)
printf("\nattaching the main thread again ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &nextEnv), (void *) 0)) != 0) {
+ if ((res = vm->AttachCurrentThread((void **) &nextEnv, (void *) 0)) != 0) {
printf("(%s,%d): TEST FAILURE: waitingThread: AttachCurrentThread() returns: %d\n",
__FILE__, __LINE__, res);
return STATUS_FAILED;
@@ -422,7 +384,7 @@
waitThreads();
checkCall(2, 0, "new threads");
- JNI_ENV_PTR(env)->DeleteGlobalRef(JNI_ENV_ARG((nextEnv==NULL)? env:nextEnv, clsObj));
+ env->DeleteGlobalRef(clsObj);
return result;
}
@@ -448,8 +410,7 @@
if (verbose)
printf("verbose mode on\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
return JNI_ERR;
@@ -467,6 +428,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,27 +27,7 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -98,9 +78,7 @@
only since JDK 1.2 */
if (verbose)
printf("\nb) Checking the function with the detached thread ...\n\ndetaching the main thread ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->DetachCurrentThread(
- JNI_ENV_ARG1(vm))) != JNI_OK)
+ if ((res = vm->DetachCurrentThread()) != JNI_OK)
printf("(%s,%d): Warning: DetachCurrentThread() returns: %d\n\
\tcheck with the detached main thread skipped\n",
__FILE__, __LINE__, res);
@@ -109,9 +87,7 @@
if (verbose)
printf("\nattaching the main thread back ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &nextEnv), (void *) 0)) != JNI_OK) {
+ if ((res = vm->AttachCurrentThread((void **) &nextEnv, (void *) 0)) != JNI_OK) {
printf("(%s,%d): TEST FAILURE: waitingThread: AttachCurrentThread() returns: %d\n",
__FILE__, __LINE__, res);
return STATUS_FAILED;
@@ -141,8 +117,7 @@
if (verbose)
printf("verbose mode on\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
return JNI_ERR;
@@ -153,6 +128,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -270,8 +257,7 @@
jint res;
jvmtiError err;
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if ( res != JNI_OK || jvmti == NULL ) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
@@ -330,23 +316,18 @@
if (!caps.can_access_local_variables ||
!caps.can_generate_breakpoint_events) return;
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "checkPoint", "()V");
- mid1 = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, cls),
- "meth01", "()D");
- mid2 = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, cls),
- "meth02", "(I)V");
- mid3 = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "meth03", "()V");
- mid4 = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "meth04", "(IJSDCFBZ)V");
+ mid = env->GetStaticMethodID(cls, "checkPoint", "()V");
+ mid1 = env->GetMethodID(cls, "meth01", "()D");
+ mid2 = env->GetMethodID(cls, "meth02", "(I)V");
+ mid3 = env->GetStaticMethodID(cls, "meth03", "()V");
+ mid4 = env->GetStaticMethodID(cls, "meth04", "(IJSDCFBZ)V");
if (mid == 0 || mid1 == 0 || mid2 == 0 || mid3 == 0 || mid4 == 0) {
printf("Cannot find Method ID for a method\n");
}
floatVal = f;
doubleVal = d;
- objVal = JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG(env, o));
- arrVal = JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG(env, a));
+ objVal = env->NewGlobalRef(o);
+ arrVal = env->NewGlobalRef(a);
err = jvmti->SetBreakpoint(mid, 0);
if (err != JVMTI_ERROR_NONE) {
@@ -369,6 +350,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -122,8 +108,7 @@
return result;
}
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
+ mid = env->GetStaticMethodID(cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
if (mid == NULL) {
printf("Cannot find method \"run\"\n");
return STATUS_FAILED;
@@ -299,6 +284,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -156,8 +143,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -215,8 +201,7 @@
if (!caps.can_access_local_variables ||
!caps.can_generate_breakpoint_events) return;
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "checkPoint", "()V");
+ mid = env->GetStaticMethodID(cls, "checkPoint", "()V");
if (mid == NULL) {
printf("Cannot find Method ID for method checkPoint\n");
result = STATUS_FAILED;
@@ -244,6 +229,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -161,8 +148,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -220,8 +206,7 @@
if (!caps.can_access_local_variables ||
!caps.can_generate_breakpoint_events) return;
- mid = JNI_ENV_PTR(env)->GetStaticMethodID(JNI_ENV_ARG(env, cls),
- "checkPoint", "()V");
+ mid = env->GetStaticMethodID(cls, "checkPoint", "()V");
if (mid == 0) {
printf("Cannot find Method ID for method checkPoint\n");
result = STATUS_FAILED;
@@ -249,6 +234,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,8 +57,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -144,6 +130,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadEnd/threadend001/threadend001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadEnd/threadend001/threadend001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -99,8 +86,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -127,7 +113,7 @@
return;
}
- prefix = JNI_ENV_PTR(env)->GetStringUTFChars(JNI_ENV_ARG(env, name), NULL);
+ prefix = env->GetStringUTFChars(name, NULL);
if (prefix == NULL) {
printf("Failed to copy UTF-8 string!\n");
result = STATUS_FAILED;
@@ -170,6 +156,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadStart/threadstart001/threadstart001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadStart/threadstart001/threadstart001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -99,8 +86,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -127,7 +113,7 @@
return;
}
- prefix = JNI_ENV_PTR(env)->GetStringUTFChars(JNI_ENV_ARG(env, name), NULL);
+ prefix = env->GetStringUTFChars(name, NULL);
if (prefix == NULL) {
printf("Failed to copy UTF-8 string!\n");
result = STATUS_FAILED;
@@ -170,6 +156,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadStart/threadstart003/threadstart003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadStart/threadstart003/threadstart003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -113,8 +100,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -166,8 +152,7 @@
return STATUS_FAILED;
}
- threadName = JNI_ENV_PTR(env)->GetStringUTFChars(JNI_ENV_ARG(env, name),
- NULL);
+ threadName = env->GetStringUTFChars(name, NULL);
if (threadName == NULL) {
printf("Failed to copy UTF-8 string!\n");
return STATUS_FAILED;
@@ -288,6 +273,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -33,27 +33,7 @@
#include "JVMTITools.h"
#include "jvmti_tools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -121,6 +101,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -149,8 +136,7 @@
printdump = JNI_TRUE;
}
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -197,6 +183,4 @@
return result;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -28,23 +28,8 @@
#include "jni_tools.h"
#include "jvmti_tools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_ARG1(x)
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_ARG1(x) x
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
/* ============================================================================= */
@@ -201,8 +186,7 @@
timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
NSK_DISPLAY0("Create first JVMTI env.\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti_1), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti_1, JVMTI_VERSION_1_1);
if (res < 0) {
NSK_COMPLAIN0("Wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -254,6 +238,4 @@
/* ============================================================================= */
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -30,27 +30,7 @@
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -70,11 +50,11 @@
jint JNICALL MyGetVersion(JNIEnv *env) {
call_count++;
- if (verbose)
+ if (verbose) {
printf("\nMyGetVersion: the function called successfully: getVer_count=%d\n",
call_count);
- return
- orig_jni_functions->GetVersion(env);
+ }
+ return orig_jni_functions->GetVersion(env);
}
void doRedirect(JNIEnv *env) {
@@ -87,8 +67,7 @@
JVMTI_ERROR_NONE) {
printf("(%s,%d): TEST FAILED: failed to get original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
result = STATUS_FAILED;
}
@@ -96,8 +75,7 @@
JVMTI_ERROR_NONE) {
printf("(%s,%d): TEST FAILED: failed to get redirected JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
result = STATUS_FAILED;
}
if (verbose)
@@ -109,8 +87,7 @@
JVMTI_ERROR_NONE) {
printf("(%s,%d): TEST FAILED: failed to set new JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
result = STATUS_FAILED;
}
@@ -127,8 +104,7 @@
JVMTI_ERROR_NONE) {
printf("(%s,%d): TEST FAILED: failed to restore original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to restore original JNI function table"));
+ env->FatalError("failed to restore original JNI function table");
result = STATUS_FAILED;
}
if (verbose)
@@ -148,7 +124,7 @@
if (verbose)
printf("\na) invoking the original function GetVersion() ...\n");
- ver = JNI_ENV_PTR(env)->GetVersion(JNI_ENV_ARG1(env));
+ ver = env->GetVersion();
if (verbose)
printf("JNIenv version=%d\n", ver);
@@ -158,7 +134,7 @@
if (verbose)
printf("\nb) invoking the redirected function GetVersion() ...\n");
- ver = JNI_ENV_PTR(env)->GetVersion(JNI_ENV_ARG1(env));
+ ver = env->GetVersion();
if (call_count == 1) {
if (verbose)
@@ -177,7 +153,7 @@
if (verbose)
printf("\nc) invoking the restored function GetVersion ...\n");
- ver = JNI_ENV_PTR(env)->GetVersion(JNI_ENV_ARG1(env));
+ ver = env->GetVersion();
if (call_count == 0) {
if (verbose)
@@ -213,8 +189,7 @@
if (verbose)
printf("verbose mode on\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
return JNI_ERR;
@@ -223,6 +198,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -31,27 +31,7 @@
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -123,16 +103,14 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
}
if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) !=
JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get redirected JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
}
if (verbose)
printf("doRedirect: the JNI function table obtained successfully\n");
@@ -142,33 +120,29 @@
printf("\ndoRedirect: obtaining method ID for \"%s %s\"...\n",
meth_info[i].m_name, meth_info[i].m_sign);
if (meth_info[i].inst) { /* an instance method */
- meth_info[i].mid = JNI_ENV_PTR(env)->GetMethodID(
- JNI_ENV_ARG(env, cls),
- meth_info[i].m_name, meth_info[i].m_sign);
+ meth_info[i].mid = env->GetMethodID(
+ cls, meth_info[i].m_name, meth_info[i].m_sign);
}
else { /* a static method */
- meth_info[i].mid = JNI_ENV_PTR(env)->GetStaticMethodID(
- JNI_ENV_ARG(env, cls),
- meth_info[i].m_name, meth_info[i].m_sign);
+ meth_info[i].mid = env->GetStaticMethodID(
+ cls, meth_info[i].m_name, meth_info[i].m_sign);
}
if (meth_info[i].mid == NULL) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILURE: failed to get the ID for the method \"%s %s\"\n",
__FILE__, __LINE__, meth_info[i].m_name, meth_info[i].m_sign);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get the ID for a method"));
+ env->FatalError("failed to get the ID for a method");
}
if (verbose)
printf("\ndoRedirect: obtaining field ID for \"%s\"...\n",
meth_info[i].f_name);
- if ((meth_info[i].fid = JNI_ENV_PTR(env)->GetStaticFieldID(
- JNI_ENV_ARG(env, cls), meth_info[i].f_name, "I")) == 0) {
+ if ((meth_info[i].fid = env->GetStaticFieldID(
+ cls, meth_info[i].f_name, "I")) == 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get ID for the field %s\n",
__FILE__, __LINE__, meth_info[i].f_name);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "cannot get field ID"));
+ env->FatalError("cannot get field ID");
}
switch(i) {
@@ -190,8 +164,7 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to set new JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
}
if (verbose)
@@ -208,16 +181,14 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to restore original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to restore original JNI function table"));
+ env->FatalError("failed to restore original JNI function table");
}
if (verbose)
printf("doRestore: the original JNI function table is restored successfully\n");
}
int getFieldVal(JNIEnv *env, jclass cls, jfieldID fid) {
- return JNI_ENV_PTR(env)->GetStaticIntField(
- JNI_ENV_ARG(env, cls), fid);
+ return env->GetStaticIntField(cls, fid);
}
void doCall(JNIEnv *env, jobject obj, jclass objCls, const char *msg) {
@@ -233,27 +204,26 @@
dVal = env->CallStaticDoubleMethod(objCls, meth_info[i].mid, 73);
break;
case 1:
- JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG(env, obj),
- meth_info[i].mid);
+ env->CallVoidMethod(obj, meth_info[i].mid);
break;
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: exception occured during the execution of the %s method\n",
__FILE__, __LINE__, msg);
- JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionDescribe();
+ env->ExceptionClear();
}
meth_info[i].java_calls = getFieldVal(env, objCls, meth_info[i].fid);
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: exception occured during getting value of the %s fieldn",
__FILE__, __LINE__, meth_info[i].f_name);
- JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionDescribe();
+ env->ExceptionClear();
}
}
@@ -306,7 +276,7 @@
return STATUS_FAILED;
}
- objCls = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG(env, obj));
+ objCls = env->GetObjectClass(obj);
/* 1: check the JNI function table interception */
if (verbose)
@@ -345,8 +315,7 @@
if (verbose)
printf("verbose mode on\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
return JNI_ERR;
@@ -355,6 +324,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -31,27 +31,7 @@
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -128,16 +108,14 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
}
if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) !=
JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get redirected JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
}
if (verbose)
printf("doRedirect: the JNI function table obtained successfully\n");
@@ -153,8 +131,7 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to set new JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
}
if (verbose)
@@ -171,8 +148,7 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to restore original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to restore original JNI function table"));
+ env->FatalError("failed to restore original JNI function table");
}
if (verbose)
printf("doRestore: the original JNI function table is restored successfully\n");
@@ -181,19 +157,18 @@
void doExc(JNIEnv *env, jthrowable thrw, jclass thrCls, const char *msg) {
jint res;
- if ((res = JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG(env, thrCls), msg)) != 0) {
+ if ((res = env->ThrowNew(thrCls, msg)) != 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to throw new exception\n",
__FILE__, __LINE__);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to failed to throw new exception"));
+ env->FatalError("failed to failed to throw new exception");
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
if (verbose)
printf("\nCHECK PASSED: exception %s thrown by ThrowNew()\n\tis detected by ExceptionOccurred() successfully\n",
msg);
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionClear();
}
else {
result = STATUS_FAILED;
@@ -201,19 +176,18 @@
__FILE__, __LINE__, msg);
}
- if ((res = JNI_ENV_PTR(env)->Throw(JNI_ENV_ARG(env, thrw))) != 0) {
+ if ((res = env->Throw(thrw)) != 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to throw exception\n",
__FILE__, __LINE__);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to failed to throw new exception"));
+ env->FatalError("failed to failed to throw new exception");
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
if (verbose)
printf("(%s,%d): CHECK PASSED: exception %s thrown by Throw()\n\tis detected by ExceptionOccurred() successfully\n",
__FILE__, __LINE__, msg);
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionClear();
}
else {
result = STATUS_FAILED;
@@ -285,13 +259,12 @@
return STATUS_FAILED;
}
- objCls = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG(env, obj));
+ objCls = env->GetObjectClass(obj);
if (verbose)
printf("\ncheck: obtaining field ID for \"name=%s signature=%s\"...\n",
javaField, excClassSig);
- if ((fid = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG(env, objCls), javaField, excClassSig)) == 0) {
+ if ((fid = env->GetFieldID(objCls, javaField, excClassSig)) == 0) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get ID for the field \"%s\"\n",
__FILE__, __LINE__, javaField);
@@ -301,13 +274,12 @@
if (verbose)
printf("check: obtaining the value of the field \"%s\"...\n",
javaField);
- thrwObj = (jthrowable) JNI_ENV_PTR(env)->GetObjectField(
- JNI_ENV_ARG(env, obj), fid);
+ thrwObj = (jthrowable) env->GetObjectField(obj, fid);
if (verbose)
printf("check: obtaining the class of the object for \"%s\"...\n",
javaField);
- thrw = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG(env, thrwObj));
+ thrw = env->GetObjectClass(thrwObj);
/* 1: check the JNI function table interception */
if (verbose)
@@ -323,8 +295,8 @@
doExc(env, thrwObj, thrw, "restored");
checkCall(2, 0, 0, 0);
- JNI_ENV_PTR(env)->DeleteLocalRef(JNI_ENV_ARG(env, thrw));
- JNI_ENV_PTR(env)->DeleteLocalRef(JNI_ENV_ARG(env, thrwObj));
+ env->DeleteLocalRef(thrw);
+ env->DeleteLocalRef(thrwObj);
return result;
}
@@ -349,8 +321,7 @@
if (verbose)
printf("verbose mode on\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
return JNI_ERR;
@@ -359,6 +330,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -31,27 +31,7 @@
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -98,21 +78,17 @@
if (verbose)
printf("\ndoRedirect: obtaining the JNI function table ...\n");
- if ((err = jvmti->GetJNIFunctionTable(&orig_jni_functions)) !=
- JVMTI_ERROR_NONE) {
+ if ((err = jvmti->GetJNIFunctionTable(&orig_jni_functions)) != JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
}
- if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) !=
- JVMTI_ERROR_NONE) {
+ if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) != JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to get redirected JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
}
if (verbose)
printf("doRedirect: the JNI function table obtained successfully\n");
@@ -127,8 +103,7 @@
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to set new JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
}
if (verbose)
@@ -140,13 +115,11 @@
if (verbose)
printf("\ndoRestore: restoring the original JNI function table ...\n");
- if ((err = jvmti->SetJNIFunctionTable(orig_jni_functions)) !=
- JVMTI_ERROR_NONE) {
+ if ((err = jvmti->SetJNIFunctionTable(orig_jni_functions)) != JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to restore original JNI function table: %s\n",
__FILE__, __LINE__, TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to restore original JNI function table"));
+ env->FatalError("failed to restore original JNI function table");
}
if (verbose)
printf("doRestore: the original JNI function table is restored successfully\n");
@@ -157,42 +130,40 @@
jobject newObj;
va_list args;
va_start(args, msg);
- if ((allObj = JNI_ENV_PTR(env)->AllocObject(JNI_ENV_ARG(env, allCls)))
+ if ((allObj = env->AllocObject(allCls))
== NULL) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to call %s AllocObject()\n",
__FILE__, __LINE__, msg);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to failed to call AllocObject()"));
+ env->FatalError("failed to failed to call AllocObject()");
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: exception occured during the call of %s AllocObject()\n",
__FILE__, __LINE__, msg);
- JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionDescribe();
+ env->ExceptionClear();
}
- newObj = JNI_ENV_PTR(env)->NewObjectV(JNI_ENV_ARG(env, allCls), ctorId, args);
+ newObj = env->NewObjectV(allCls, ctorId, args);
if (newObj == NULL) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: failed to call %s NewObjectV()\n",
__FILE__, __LINE__, msg);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to failed to call NewObjectV()"));
+ env->FatalError("failed to failed to call NewObjectV()");
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
result = STATUS_FAILED;
printf("(%s,%d): TEST FAILED: exception occured during the call of %s AllocObject()\n",
__FILE__, __LINE__, msg);
- JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionDescribe();
+ env->ExceptionClear();
}
va_end(args);
- JNI_ENV_PTR(env)->DeleteLocalRef(JNI_ENV_ARG(env, allObj));
- JNI_ENV_PTR(env)->DeleteLocalRef(JNI_ENV_ARG(env, newObj));
+ env->DeleteLocalRef(allObj);
+ env->DeleteLocalRef(newObj);
}
void checkCall(int step, int exAllObjCalls, int exNewObjCalls) {
@@ -240,15 +211,13 @@
return STATUS_FAILED;
}
- if ((objCls = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG(env, classSig)))
- == NULL) {
+ if ((objCls = env->FindClass(classSig)) == NULL) {
printf("(%s,%d): TEST FAILED: failed to call FindClass() for \"%s\"\n",
__FILE__, __LINE__, classSig);
return STATUS_FAILED;
}
- if ((ctorId = JNI_ENV_PTR(env)->GetMethodID(
- JNI_ENV_ARG(env, objCls), "<init>", "()V"))
+ if ((ctorId = env->GetMethodID(objCls, "<init>", "()V"))
== NULL) {
printf("(%s,%d): TEST FAILED: failed to call GetMethodID() for a constructor\n",
__FILE__, __LINE__);
@@ -292,8 +261,7 @@
if (verbose)
printf("verbose mode on\n");
- res = JNI_ENV_PTR(jvm)->
- GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
return JNI_ERR;
@@ -302,6 +270,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -34,27 +34,7 @@
#include "jvmti_tools.h"
#include "native_thread.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -119,21 +99,17 @@
NSK_DISPLAY1("\n%s JVMTI env: doRedirect: obtaining the JNI function table ...\n",
(indx==0)?"first":"second");
- if ((err = jvmti->GetJNIFunctionTable(&orig_jni_functions[indx])) !=
- JVMTI_ERROR_NONE) {
+ if ((err = jvmti->GetJNIFunctionTable(&orig_jni_functions[indx])) != JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
NSK_COMPLAIN2("TEST FAILED: %s JVMTI env: failed to get original JNI function table: %s\n",
(indx==0)?"first":"second", TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
}
- if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions[indx])) !=
- JVMTI_ERROR_NONE) {
+ if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions[indx])) != JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
NSK_COMPLAIN2("TEST FAILED: %s JVMTI env: failed to get redirected JNI function table: %s\n",
(indx==0)?"first":"second", TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
}
NSK_DISPLAY1("%s JVMTI env: doRedirect: the JNI function table obtained successfully\n\
@@ -142,13 +118,11 @@
redir_jni_functions[indx]->GetVersion =
(indx==0)?MyGetVersionA:MyGetVersionB;
- if ((err = jvmti->SetJNIFunctionTable(redir_jni_functions[indx])) !=
- JVMTI_ERROR_NONE) {
+ if ((err = jvmti->SetJNIFunctionTable(redir_jni_functions[indx])) != JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
NSK_COMPLAIN2("TEST FAILED: %s JVMTI env: failed to set new JNI function table: %s\n",
(indx==0)?"first":"second", TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
}
NSK_DISPLAY1("%s JVMTI env: doRedirect: the functions are overwritten successfully\n",
@@ -158,8 +132,7 @@
static void provokeIntercept(JNIEnv *env, const char *name) {
jint res;
- res = JNI_ENV_PTR(env)->
- GetVersion(JNI_ENV_ARG1(env));
+ res = env->GetVersion();
NSK_DISPLAY2("\nGetVersion() called by the agent %s returns %d\n",
name, res);
}
@@ -198,10 +171,8 @@
thrstarted[indx] = redir[indx] = redir_calls[indx] = 0;
- NSK_DISPLAY1("\nagent %s initializer: obtaining the JVMTI env ...\n",
- (indx==0)?"A":"B");
- res = JNI_ENV_PTR(vm)->
- GetEnv(JNI_ENV_ARG(vm, (void **) &jvmti[indx]), JVMTI_VERSION_1_1);
+ NSK_DISPLAY1("\nagent %s initializer: obtaining the JVMTI env ...\n", (indx==0)?"A":"B");
+ res = vm->GetEnv((void **) &jvmti[indx], JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti[indx] == NULL) {
NSK_COMPLAIN1("TEST FAILURE: failed to call GetEnv for the agent %s\n",
(indx==0)?"A":"B");
@@ -230,8 +201,7 @@
NSK_DISPLAY1("\nagent %s initializer: setting event callbacks done\n\tenabling events ...\n",
(indx==0)?"A":"B");
- if ((err = jvmti[indx]->SetEventNotificationMode(
- JVMTI_ENABLE,
+ if ((err = jvmti[indx]->SetEventNotificationMode(JVMTI_ENABLE,
JVMTI_EVENT_VM_INIT, NULL)) != JVMTI_ERROR_NONE) { /* enable event globally */
NSK_COMPLAIN2("TEST FAILURE: failed to enable JVMTI_EVENT_VM_INIT event for the agent %s: %s\n",
(indx==0)?"A":"B", TranslateError(err));
@@ -282,11 +252,8 @@
int exitCode = PASSED;
NSK_DISPLAY0("\nthe agent A started\n\tattaching the thread to the VM ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
- NSK_COMPLAIN1("TEST FAILURE: AttachCurrentThread() returns: %d\n",
- res);
+ if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
+ NSK_COMPLAIN1("TEST FAILURE: AttachCurrentThread() returns: %d\n", res);
exit(STATUS_FAILED);
}
@@ -333,7 +300,7 @@
NSK_DISPLAY1("\nagent A: detaching and returning exit code %d\n",
exitCode);
- if ((res = JNI_ENV_PTR(vm)->DetachCurrentThread(JNI_ENV_ARG1(vm))) != 0) {
+ if ((res = vm->DetachCurrentThread()) != 0) {
NSK_COMPLAIN1("TEST WARNING: agent A: DetachCurrentThread() returns: %d\n", res);
}
return exitCode;
@@ -347,9 +314,7 @@
int exitCode = PASSED;
NSK_DISPLAY0("\nthe agent B started\n\tattaching the thread to the VM ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
+ if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
NSK_COMPLAIN1("TEST FAILURE: AttachCurrentThread() returns: %d\n",
res);
exit(STATUS_FAILED);
@@ -396,7 +361,7 @@
NSK_DISPLAY1("\nagent B: detaching and returning exit code %d\n",
exitCode);
- if ((res = JNI_ENV_PTR(vm)->DetachCurrentThread(JNI_ENV_ARG1(vm))) != 0) {
+ if ((res = vm->DetachCurrentThread()) != 0) {
NSK_COMPLAIN1("TEST WARNING: agent B: DetachCurrentThread() returns: %d\n", res);
}
return exitCode;
@@ -470,6 +435,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -34,27 +34,7 @@
#include "jvmti_tools.h"
#include "native_thread.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
- #ifdef __cplusplus
- #define JNI_ENV_ARG(x, y) y
- #define JNI_ENV_PTR(x) x
- #else
- #define JNI_ENV_ARG(x, y) x, y
- #define JNI_ENV_PTR(x) (*x)
- #endif
-#endif
-
-#ifndef JNI_ENV_ARG1
- #ifdef __cplusplus
- #define JNI_ENV_ARG1(x)
- #else
- #define JNI_ENV_ARG1(x) x
- #endif
-#endif
#define PASSED 0
#define STATUS_FAILED 2
@@ -65,7 +45,7 @@
// Helper for thread detach and terminate
#define THREAD_return(status) \
do { \
- int res = JNI_ENV_PTR(vm)->DetachCurrentThread(JNI_ENV_ARG1(vm)); \
+ int res = vm->DetachCurrentThread(); \
if (res != 0) \
NSK_COMPLAIN1("TEST WARNING: DetachCurrentThread() returns: %d\n", res); \
else \
@@ -128,17 +108,16 @@
static jint enterMonitor(JNIEnv *env, const char *thr) {
jint result;
- if ((result = JNI_ENV_PTR(env)->
- MonitorEnter(JNI_ENV_ARG(env, clsObj))) != 0) {
+ if ((result = env->MonitorEnter(clsObj)) != 0) {
NSK_COMPLAIN2("TEST FAILURE: %s: MonitorEnter() returns: %d\n",
thr, result);
return STATUS_FAILED;
}
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+ if (env->ExceptionOccurred()) {
NSK_COMPLAIN1("TEST FAILURE: %s: exception occured\n",
thr);
- JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
- JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+ env->ExceptionDescribe();
+ env->ExceptionClear();
return STATUS_FAILED;
}
@@ -148,8 +127,7 @@
static jint exitMonitor(JNIEnv *env, const char *thr) {
jint result;
- if ((result = JNI_ENV_PTR(env)->
- MonitorExit(JNI_ENV_ARG(env, clsObj))) != 0) {
+ if ((result = env->MonitorExit(clsObj)) != 0) {
NSK_COMPLAIN2("TEST FAILURE: %s: MonitorExit() returns: %d\n",
thr, result);
return STATUS_FAILED;
@@ -167,16 +145,14 @@
result = STATUS_FAILED;
NSK_COMPLAIN1("TEST FAILED: failed to get original JNI function table: %s\n",
TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get original JNI function table"));
+ env->FatalError("failed to get original JNI function table");
}
if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) !=
JVMTI_ERROR_NONE) {
result = STATUS_FAILED;
NSK_COMPLAIN1("TEST FAILED: failed to get redirected JNI function table: %s\n",
TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get redirected JNI function table"));
+ env->FatalError("failed to get redirected JNI function table");
}
NSK_DISPLAY0("doRedirect: the JNI function table obtained successfully\n\
@@ -189,8 +165,7 @@
result = STATUS_FAILED;
NSK_COMPLAIN1("TEST FAILED: failed to set new JNI function table: %s\n",
TranslateError(err));
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to set new JNI function table"));
+ env->FatalError("failed to set new JNI function table");
}
NSK_DISPLAY0("doRedirect: the functions are overwritten successfully\n");
@@ -222,9 +197,7 @@
NSK_DISPLAY1("waitingThread: thread #%d started\n\
\tattaching the thread to the VM ...\n",
indx);
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
+ if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
NSK_COMPLAIN1("TEST FAILURE: waitingThread: AttachCurrentThread() returns: %d\n",
res);
return STATUS_FAILED;
@@ -255,9 +228,7 @@
int tries = 0;
NSK_DISPLAY0("ownerThread: thread started\n\tattaching the thread to the VM ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
+ if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
NSK_COMPLAIN1("TEST FAILURE: ownerThread: AttachCurrentThread() returns: %d\n",
res);
return STATUS_FAILED;
@@ -277,8 +248,7 @@
if (tries > TRIES) {
NSK_COMPLAIN1("TEST FAILED: ownerThread: time exceed after %d attempts\n",
TRIES);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "ownerThread: time exceed"));
+ env->FatalError("ownerThread: time exceed");
}
} while(releaseMon != 1);
@@ -298,9 +268,7 @@
int tries = 0;
NSK_DISPLAY0("redirectorThread: thread started\n\tattaching the thread to the VM ...\n");
- if ((res =
- JNI_ENV_PTR(vm)->AttachCurrentThread(
- JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
+ if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
NSK_COMPLAIN1("TEST FAILURE: redirectorThread: AttachCurrentThread() returns: %d\n",
res);
return STATUS_FAILED;
@@ -320,21 +288,18 @@
jfieldID fid;
jclass _objCls;
- _objCls = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG(env, obj));
+ _objCls = env->GetObjectClass(obj);
NSK_DISPLAY2("getObjectFromField: obtaining field ID for name=\"%s\" signature=\"%s\"...\n",
javaField, classSig);
- if ((fid = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG(env, _objCls), javaField, classSig)) == 0) {
+ if ((fid = env->GetFieldID(_objCls, javaField, classSig)) == 0) {
result = STATUS_FAILED;
NSK_COMPLAIN1("TEST FAILURE: failed to get ID for the field \"%s\"\n",
javaField);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to get ID for the java field"));
+ env->FatalError("failed to get ID for the java field");
}
- return JNI_ENV_PTR(env)->GetObjectField(
- JNI_ENV_ARG(env, obj), fid);
+ return env->GetObjectField(obj, fid);
}
JNIEXPORT jint JNICALL
@@ -355,12 +320,10 @@
}
/* prepare the testing */
- if ((clsObj = JNI_ENV_PTR(env)->NewGlobalRef(
- JNI_ENV_ARG(env, getObjectFromField(env, obj)))) == NULL) {
+ if ((clsObj = env->NewGlobalRef(getObjectFromField(env, obj))) == NULL) {
NSK_COMPLAIN1("TEST FAILURE: cannot create a new global reference of class \"%s\"\n",
classSig);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- "failed to create a new global reference"));
+ env->FatalError("failed to create a new global reference");
}
NSK_DISPLAY0("starting monitor owner thread ...\n");
@@ -377,8 +340,7 @@
if (tries > TRIES) {
NSK_COMPLAIN1("TEST FAILURE: the monitor is still not entered by the owner thread after %d attempts\n",
TRIES);
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
- " the monitor is still not entered by the owner thread"));
+ env->FatalError(" the monitor is still not entered by the owner thread");
}
} while(monEntered != 1);
@@ -483,7 +445,7 @@
free(waitThr[i]);
}
- JNI_ENV_PTR(env)->DeleteGlobalRef(JNI_ENV_ARG(env, clsObj));
+ env->DeleteGlobalRef(clsObj);
NSK_DISPLAY0("<<<\n\n");
NSK_DISPLAY0(">>> TEST CASE c) Checking number of the intercepted calls ...\n");
@@ -523,6 +485,4 @@
return JNI_OK;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp Sat Sep 15 14:03:07 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp Mon Sep 17 09:36:33 2018 -0700
@@ -27,21 +27,8 @@
#include "agent_common.h"
#include "JVMTITools.h"
-#ifdef __cplusplus
extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x,y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
#define STATUS_FAILED 2
#define PASSED 0
@@ -174,8 +161,7 @@
printf(">>>>>>>> Invoke ForceEarlyReturn()\n");
printf("Before call to GetMethodID(%s, %s)\n", name_exp, sig_exp);
- midActiveMethod = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG(env, targCls),
- name_exp, sig_exp);
+ midActiveMethod = env->GetMethodID(targCls, name_exp, sig_exp);
if (midActiveMethod == NULL) {
printf("Cannot find Method ID for method %s\n", name_exp);
RETURN_FAILED;
@@ -211,8 +197,7 @@
jint res;
jvmtiError err;
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1_1);
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
if (res != JNI_OK || jvmti == NULL) {
printf("Wrong error code from a valid call to GetEnv!\n");
return JNI_ERR;
@@ -288,6 +273,4 @@
return errCode;
}
-#ifdef __cplusplus
}
-#endif
--- a/test/jdk/com/sun/jdi/BadHandshakeTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/jdi/BadHandshakeTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -36,18 +36,17 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import jdk.test.lib.process.ProcessTools;
/* @test
* @bug 6306165 6432567
* @summary Check that a bad handshake doesn't cause a debuggee to abort
- * @library /lib/testlibrary
* @library /test/lib
*
* @modules java.management
* jdk.jdi
- * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
+ * @build VMConnection BadHandshakeTest Exit0
* @run driver BadHandshakeTest
*/
public class BadHandshakeTest {
--- a/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,6 @@
/*
* @test
* @summary Smoke test for JDWP hardening
- * @library /lib/testlibrary
* @library /test/lib
* @run driver BasicJDWPConnectionTest
*/
@@ -37,7 +36,7 @@
import java.net.SocketException;
import jdk.test.lib.apps.LingeredApp;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import java.util.ArrayList;
import java.util.List;
--- a/test/jdk/com/sun/jdi/DebuggerThreadTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/jdi/DebuggerThreadTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@
* Move to top ThreadGroup and dump all threads.
*/
public void dumpThreads() {
+ int finishedThreads = 0;
ThreadGroup tg = Thread.currentThread().getThreadGroup();
ThreadGroup parent = tg.getParent();
while (parent != null) {
@@ -77,7 +78,14 @@
int gotThreads = tg.enumerate(list, true);
for (int i = 0; i < Math.min(gotThreads, list.length); i++){
Thread t = list[i];
- String groupName = t.getThreadGroup().getName();
+ ThreadGroup tga = t.getThreadGroup();
+ String groupName;
+ if (tga == null) {
+ groupName = "<completed>";
+ finishedThreads++ ;
+ } else {
+ groupName = tga.getName();
+ }
System.out.println("Thread [" + i + "] group = '" +
groupName +
@@ -89,7 +97,10 @@
failure("FAIL: non-daemon thread '" + t.getName() +
"' found in ThreadGroup '" + groupName + "'");
}
-
+ }
+ if (finishedThreads > 0 ) {
+ failure("FAIL: " + finishedThreads +
+ " threads completed while VM suspended.");
}
}
--- a/test/jdk/com/sun/jdi/DoubleAgentTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/jdi/DoubleAgentTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,16 +23,14 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/* @test
* @bug 6354345
* @summary Check that multiple -agentlib statements in command line fails
*
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
- * @build jdk.testlibrary.*
* @build DoubleAgentTest Exit0
* @run driver DoubleAgentTest
*/
--- a/test/jdk/com/sun/jdi/ExclusiveBind.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/jdi/ExclusiveBind.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,12 +25,11 @@
* @bug 4531526
* @summary Test that more than one debuggee cannot bind to same port
* at the same time.
- * @library /lib/testlibrary
* @library /test/lib
*
* @modules java.management
* jdk.jdi
- * @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld
+ * @build VMConnection ExclusiveBind HelloWorld
* @run driver ExclusiveBind
*/
import java.net.ServerSocket;
@@ -46,7 +45,7 @@
import java.util.concurrent.TimeUnit;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ExclusiveBind {
/*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/jndi/ldap/DisconnectNPETest.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Hashtable;
+
+/*
+ * @test
+ * @bug 8205330
+ * @summary Test that If a connection has already been established and then
+ * the LDAP directory server sends an (unsolicited)
+ * "Notice of Disconnection", make sure client handle it correctly,
+ * no NPE been thrown.
+ * @run main/othervm DisconnectNPETest
+ */
+
+public class DisconnectNPETest {
+ // Normally the NPE bug should be hit less than 100 times run, but just in
+ // case, we set repeat count to 1000 here.
+ private static final int REPEAT_COUNT = 1000;
+
+ public static void main(String[] args) throws IOException {
+ new DisconnectNPETest().run();
+ }
+
+ private ServerSocket serverSocket;
+ private Hashtable<Object, Object> env;
+ private TestLDAPServer server;
+
+ private void initRes() throws IOException {
+ serverSocket = new ServerSocket(0, 0, InetAddress.getLoopbackAddress());
+ server = new TestLDAPServer();
+ server.start();
+ }
+
+ private void initTest() {
+ env = new Hashtable<>();
+ env.put(Context.INITIAL_CONTEXT_FACTORY,
+ "com.sun.jndi.ldap.LdapCtxFactory");
+ env.put(Context.PROVIDER_URL, String.format("ldap://%s:%d/",
+ InetAddress.getLoopbackAddress().getHostName(),
+ serverSocket.getLocalPort()));
+ env.put(Context.SECURITY_AUTHENTICATION, "simple");
+ env.put(Context.SECURITY_PRINCIPAL,
+ "cn=8205330,ou=Client6,ou=Vendor1,o=IMC,c=US");
+ env.put(Context.SECURITY_CREDENTIALS, "secret123");
+ }
+
+ private void run() throws IOException {
+ initRes();
+ initTest();
+ int count = 0;
+ try {
+ while (count < REPEAT_COUNT) {
+ count++;
+ InitialDirContext context = null;
+ try {
+ context = new InitialDirContext(env);
+ } catch (NamingException ne) {
+ System.out.println("(" + count + "/" + REPEAT_COUNT
+ + ") It's ok to get NamingException: " + ne);
+ // for debug
+ ne.printStackTrace(System.out);
+ } finally {
+ cleanupContext(context);
+ }
+ }
+ } finally {
+ System.out.println("Test count: " + count + "/" + REPEAT_COUNT);
+ cleanupTest();
+ }
+ }
+
+ private void cleanupTest() {
+ if (server != null) {
+ server.stopServer();
+ }
+ cleanupClosableRes(serverSocket);
+ }
+
+ private void cleanupContext(DirContext context) {
+ if (context != null) {
+ try {
+ context.close();
+ } catch (NamingException e) {
+ // ignore
+ }
+ }
+ }
+
+ private static void cleanupClosableRes(Closeable res) {
+ if (res != null) {
+ try {
+ res.close();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+
+ class TestLDAPServer extends Thread {
+ private volatile boolean isRunning;
+
+ TestLDAPServer() {
+ isRunning = true;
+ }
+
+ private void stopServer() {
+ isRunning = false;
+ }
+
+ @Override
+ public void run() {
+ try {
+ while (isRunning) {
+ Socket clientSocket = serverSocket.accept();
+ Thread handler = new Thread(
+ new LDAPServerHandler(clientSocket));
+ handler.start();
+ }
+ } catch (IOException e) {
+ if (isRunning) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ static class LDAPServerHandler implements Runnable {
+ // "Notice of Disconnection" message
+ private static final byte[] DISCONNECT_MSG = { 0x30, 0x4C, 0x02, 0x01,
+ 0x00, 0x78, 0x47, 0x0A, 0x01, 0x34, 0x04, 0x00, 0x04, 0x28,
+ 0x55, 0x4E, 0x41, 0x56, 0x41, 0x49, 0x4C, 0x41, 0x42, 0x4C,
+ 0x45, 0x3A, 0x20, 0x54, 0x68, 0x65, 0x20, 0x73, 0x65, 0x72,
+ 0x76, 0x65, 0x72, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x64,
+ 0x69, 0x73, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x21,
+ (byte) 0x8A, 0x16, 0x31, 0x2E, 0x33, 0x2E, 0x36, 0x2E, 0x31,
+ 0x2E, 0x34, 0x2E, 0x31, 0x2E, 0x31, 0x34, 0x36, 0x36, 0x2E,
+ 0x32, 0x30, 0x30, 0x33, 0x36 };
+ private static final byte[] BIND_RESPONSE = { 0x30, 0x0C, 0x02, 0x01,
+ 0x01, 0x61, 0x07, 0x0A, 0x01, 0x00, 0x04, 0x00, 0x04, 0x00 };
+ private final Socket clientSocket;
+
+ private LDAPServerHandler(final Socket clientSocket) {
+ this.clientSocket = clientSocket;
+ }
+
+ @Override
+ public void run() {
+ try (clientSocket;
+ OutputStream out = clientSocket.getOutputStream();
+ InputStream in = clientSocket.getInputStream()) {
+ if (in.read() > 0) {
+ in.skip(in.available());
+ out.write(BIND_RESPONSE);
+ out.write(DISCONNECT_MSG);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--- a/test/jdk/com/sun/tools/attach/RunnerUtil.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/tools/attach/RunnerUtil.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
import jdk.test.lib.thread.ProcessThread;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* Utility functions for test runners.
--- a/test/jdk/com/sun/tools/attach/StartManagementAgent.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/com/sun/tools/attach/StartManagementAgent.java Mon Sep 17 09:36:33 2018 -0700
@@ -34,19 +34,18 @@
import javax.management.remote.JMXConnectorFactory;
import jdk.test.lib.thread.ProcessThread;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
* @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
*
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
* jdk.attach
* jdk.jartool/sun.tools.jar
*
- * @run build jdk.testlibrary.* Application SimpleProvider jdk.testlibrary.*
+ * @run build Application SimpleProvider
* @run main/timeout=300 StartManagementAgent
*/
--- a/test/jdk/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,12 +27,12 @@
@bug 8071668
@summary Check whether clipboard see changes from external process after taking ownership
@author Anton Nashatyrev: area=datatransfer
- @library /lib/testlibrary
- @build jdk.testlibrary.Utils
+ @library /test/lib
+ @build jdk.test.lib.Utils
@run main ClipboardInterVMTest
*/
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import java.awt.*;
import java.awt.datatransfer.*;
--- a/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,8 @@
* @summary Call Class.forName() on the system classloader from a class loaded
* from a custom classloader.
* @library /lib/testlibrary
- * @build jdk.testlibrary.Utils JarUtils
+ * @library /test/lib
+ * @build jdk.test.lib.Utils JarUtils
* @build ClassForName ClassForNameLeak
* @run main/othervm/policy=test.policy -Djava.security.manager ClassForNameLeak
*/
@@ -48,7 +49,7 @@
import java.util.concurrent.Future;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* Create .jar, load ClassForName from .jar using a URLClassLoader
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/Object/WaitTooLong.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8210787
+ * @summary Object.wait(long, int) throws inappropriate IllegalArgumentException
+ */
+
+public class WaitTooLong {
+ public static void main(String[] args) {
+ test(0);
+ test(1);
+ test(500000);
+ test(999999);
+ }
+
+ static void test(int nanos) {
+ try {
+ WaitTooLong.class.wait(Long.MAX_VALUE, nanos);
+ } catch (IllegalMonitorStateException expected) {
+ } catch (IllegalArgumentException | InterruptedException unexpected) {
+ throw new RuntimeException("Unexpected", unexpected);
+ }
+ }
+}
--- a/test/jdk/java/lang/Thread/ThreadStateController.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/Thread/ThreadStateController.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
import java.util.concurrent.locks.LockSupport;
import jdk.test.lib.LockFreeLogger;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* ThreadStateController allows a thread to request this thread to transition
--- a/test/jdk/java/lang/instrument/PremainClass/NoPremainAgentTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/instrument/PremainClass/NoPremainAgentTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,17 +23,16 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
* @bug 6289149
* @summary test when the agent's class is missing the premain() function.
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
* java.instrument
- * @run build jdk.testlibrary.* DummyMain
+ * @run build DummyMain
* @run shell ../MakeJAR3.sh NoPremainAgent
* @run main/othervm -XX:-CreateCoredumpOnCrash NoPremainAgentTest
*/
--- a/test/jdk/java/lang/instrument/PremainClass/PremainClassTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/instrument/PremainClass/PremainClassTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,16 +23,15 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
* @bug 5055293
* @summary Test non ascii characters in the Premain-Class attribute.
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
- * @run build jdk.testlibrary.* DummyMain
+ * @run build DummyMain
* @run main PremainClassTest
*/
public class PremainClassTest {
--- a/test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,17 +23,16 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
* @bug 6289149
* @summary test when the agent's class has a zero arg premain() function.
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
* java.instrument
- * @run build jdk.testlibrary.* DummyMain
+ * @run build DummyMain
* @run shell ../MakeJAR3.sh ZeroArgPremainAgent
* @run main/othervm -XX:-CreateCoredumpOnCrash ZeroArgPremainAgentTest
*/
--- a/test/jdk/java/lang/invoke/LFCaching/LambdaFormTestCase.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/LFCaching/LambdaFormTestCase.java Mon Sep 17 09:36:33 2018 -0700
@@ -22,7 +22,7 @@
*/
import jdk.test.lib.TimeLimitedRunner;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
import test.java.lang.invoke.lib.Helper;
--- a/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
import jdk.test.lib.TimeLimitedRunner;
import jdk.testlibrary.Asserts;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
import test.java.lang.invoke.lib.Helper;
--- a/test/jdk/java/lang/invoke/MethodHandlesAsCollectorTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesAsCollectorTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesAsCollectorTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/MethodHandlesCastFailureTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesCastFailureTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesCastFailureTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesGeneralTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/MethodHandlesInsertArgumentsTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesInsertArgumentsTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesInsertArgumentsTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/MethodHandlesInvokersTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesInvokersTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesInvokersTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/MethodHandlesPermuteArgumentsTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesPermuteArgumentsTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesPermuteArgumentsTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/MethodHandlesSpreadArgumentsTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/MethodHandlesSpreadArgumentsTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for java.lang.invoke.MethodHandles
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesSpreadArgumentsTest.java remote/RemoteExample.java
* @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
* -XX:-VerifyDependencies
--- a/test/jdk/java/lang/invoke/PermuteArgsTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/PermuteArgsTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/* @test
* @summary unit tests for method handles which permute their arguments
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @run testng/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -ea -esa -DPermuteArgsTest.MAX_ARITY=8 test.java.lang.invoke.PermuteArgsTest
*/
--- a/test/jdk/java/lang/invoke/TestCatchExceptionWithVarargs.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/TestCatchExceptionWithVarargs.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8019184
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @summary MethodHandles.catchException() fails when methods have 8 args + varargs
* @run main TestCatchExceptionWithVarargs
*/
--- a/test/jdk/java/lang/invoke/VarargsArrayTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/VarargsArrayTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -34,7 +34,7 @@
* @summary unit tests for varargs array methods: MethodHandleInfo.varargsArray(int),
* MethodHandleInfo.varargsArray(Class,int) & MethodHandleInfo.varargsList(int)
* @modules java.base/sun.invoke.util
- * @library /lib/testlibrary /java/lang/invoke/common
+ * @library /test/lib /java/lang/invoke/common
* @compile/module=java.base java/lang/invoke/MethodHandleHelper.java
* @run main/bootclasspath VarargsArrayTest
* @run main/bootclasspath/othervm -DVarargsArrayTest.MAX_ARITY=255 -DVarargsArrayTest.START_ARITY=250
--- a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
package test.java.lang.invoke.lib;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* Helper class used to catch and process VirtualMachineError with message "Out
@@ -36,7 +36,7 @@
/**
* Checks if an instance of Throwable is caused by VirtualMachineError with
* message "Out of space in CodeCache". May be used as filter in method
- * {@code jdk.testlibrary.Utils.filterException}.
+ * {@code jdk.test.lib.Utils.filterException}.
*
* @param t - Throwable to check.
* @return true if Throwable is caused by VME, false otherwise.
--- a/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -32,9 +32,9 @@
* @requires vm.gc == "null"
* @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
* @requires vm.opt.DisableExplicitGC != "true"
- * @library /lib/testlibrary/ /test/lib
+ * @library /test/lib
*
- * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil
+ * @build LowMemoryTest MemoryUtil RunUtil
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. LowMemoryTest
@@ -47,7 +47,7 @@
import javax.management.openmbean.CompositeData;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import sun.hotspot.code.Compiler;
--- a/test/jdk/java/lang/management/MemoryMXBean/RunUtil.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/lang/management/MemoryMXBean/RunUtil.java Mon Sep 17 09:36:33 2018 -0700
@@ -31,7 +31,7 @@
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class RunUtil {
--- a/test/jdk/java/net/MulticastSocket/MultiDead.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/net/MulticastSocket/MultiDead.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,9 +25,7 @@
* @test
* @bug 8072466
* @summary Deadlock when initializing MulticastSocket and DatagramSocket
- * @library /lib/testlibrary
* @library /test/lib
- * @build jdk.testlibrary.*
* @run main/othervm MultiDead
*/
@@ -38,7 +36,7 @@
import java.util.concurrent.CountDownLatch;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import jdk.test.lib.JDKToolLauncher;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class MultiDead {
private static final int THREAD_PAIR_COUNT = 4;
--- a/test/jdk/java/net/httpclient/security/Driver.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/net/httpclient/security/Driver.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,10 +25,11 @@
* @test
* @bug 8087112
* @library /lib/testlibrary/
+ * @library /test/lib
* @modules java.net.http
* java.logging
* jdk.httpserver
- * @build jdk.testlibrary.SimpleSSLContext jdk.testlibrary.Utils
+ * @build jdk.testlibrary.SimpleSSLContext jdk.test.lib.Utils
* @compile ../../../../com/sun/net/httpserver/LogFilter.java
* @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
* @compile ../ProxyServer.java
@@ -55,7 +56,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* Driver for tests
--- a/test/jdk/java/nio/channels/FileChannel/LoopingTruncate.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/nio/channels/FileChannel/LoopingTruncate.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,8 +25,8 @@
* @test
* @bug 8137121 8137230
* @summary (fc) Infinite loop FileChannel.truncate
- * @library /lib/testlibrary
- * @build jdk.testlibrary.Utils
+ * @library /test/lib
+ * @build jdk.test.lib.Utils
* @run main/othervm/timeout=300 LoopingTruncate
*/
@@ -37,7 +37,7 @@
import java.nio.file.Path;
import static java.nio.file.StandardOpenOption.*;
import java.util.concurrent.TimeUnit;
-import static jdk.testlibrary.Utils.adjustTimeout;
+import static jdk.test.lib.Utils.adjustTimeout;
public class LoopingTruncate {
--- a/test/jdk/java/nio/channels/Selector/SelectWithConsumer.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/nio/channels/Selector/SelectWithConsumer.java Mon Sep 17 09:36:33 2018 -0700
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 8199433
+ * @bug 8199433 8208780
* @run testng SelectWithConsumer
* @summary Unit test for Selector select(Consumer), select(Consumer,long) and
* selectNow(Consumer)
@@ -62,9 +62,19 @@
var interestOps = key.interestOps();
var notifiedOps = new AtomicInteger();
+ if (expectedOps == 0) {
+ // ensure select(Consumer) does not block indefinitely
+ sel.wakeup();
+ } else {
+ // ensure that the channel is ready for all expected operations
+ sel.select();
+ while ((key.readyOps() & interestOps) != expectedOps) {
+ Thread.sleep(100);
+ sel.select();
+ }
+ }
+
// select(Consumer)
- if (expectedOps == 0)
- sel.wakeup(); // ensure select does not block
notifiedOps.set(0);
int n = sel.select(k -> {
assertTrue(Thread.currentThread() == callerThread);
--- a/test/jdk/java/nio/channels/Selector/Wakeup.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/nio/channels/Selector/Wakeup.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
/* @test
* @bug 6405995
* @summary Unit test for selector wakeup and interruption
- * @library .. /lib/testlibrary/
+ * @library .. /test/lib
*/
import java.io.*;
@@ -44,7 +44,7 @@
}
static class Sleeper extends TestThread {
- private static final long TIMEOUT = jdk.testlibrary.Utils.adjustTimeout(20_000);
+ private static final long TIMEOUT = jdk.test.lib.Utils.adjustTimeout(20_000);
// barrier is used to synchronize sleeper thread and checking
// thread which is the main thread: when go() get to the end,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/util/ServiceLoader/basic/ServiceLoaderBasicTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4640520 6354623 7198496
+ * @summary Unit test for java.util.ServiceLoader
+ * @library /lib/testlibrary /test/lib
+ * @build JarUtils jdk.test.lib.process.*
+ * Basic Load FooService FooProvider1 FooProvider2 FooProvider3 BarProvider
+ * @run testng ServiceLoaderBasicTest
+ */
+
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.ProcessTools;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static java.util.Arrays.asList;
+
+public class ServiceLoaderBasicTest {
+
+ private static final String METAINFO = "META-INF/services/FooService";
+ private static final Path XTEST_CONFIG = Path.of("x.test").resolve(METAINFO);
+ private static final Path XMETA_CONFIG = Path.of("x.meta").resolve(METAINFO);
+ private static final Path P2JAR = Path.of("p2.jar");
+ private static final Path P2DUPJAR = Path.of("p2dup.jar");
+ private static final Path P3JAR = Path.of("x.ext", "p3.jar");
+
+ private static final String XTEST = File.pathSeparator + "x.test";
+ private static final String XMETA = File.pathSeparator + "x.meta";
+ private static final String P2 = File.pathSeparator + P2JAR.toString();
+ private static final String P2DUP = File.pathSeparator + P2DUPJAR.toString();
+ private static final String P3 = File.pathSeparator + P3JAR.toString();
+
+ private static final String XTEST_CP = Utils.TEST_CLASS_PATH + XTEST;
+ private static final String P2_CP = Utils.TEST_CLASS_PATH + P2;
+ private static final String P2DUP_CP = P2_CP + P2DUP;
+ private static final String P3P2_CP = Utils.TEST_CLASS_PATH + P3 + P2;
+ private static final String XTESTP2_CP = XTEST_CP + P2;
+ private static final String P3XTEST_CP = Utils.TEST_CLASS_PATH + P3 + XTEST;
+ private static final String P3XTESTP2_CP = P3XTEST_CP + P2;
+ private static final String XMETA_CP = Utils.TEST_CLASS_PATH + XMETA;
+ private static final String XMETAXTEST_CP = XMETA_CP + XTEST;
+ private static final String XTESTXMETA_CP = XTEST_CP + XMETA;
+ private static final String XTESTXMETAP2_CP = XTESTXMETA_CP + P2;
+
+ @BeforeClass
+ public void initialize() throws Exception {
+ createProviderConfig(XTEST_CONFIG, "FooProvider1");
+ createProviderConfig(XMETA_CONFIG, "FooProvider42");
+ createJar(P2JAR, "FooProvider2", List.of("FooProvider2"));
+ createJar(P3JAR, "FooProvider3", List.of("FooProvider3", "FooService"));
+ Files.copy(P2JAR, P2DUPJAR, REPLACE_EXISTING);
+ }
+
+ @DataProvider
+ public Object[][] testCases() {
+ return new Object[][]{
+ // CLI options, Test, Runtime arguments
+ // Success cases
+ {List.of("-cp", XTESTP2_CP, "Basic")},
+ {List.of("-cp", XTEST_CP, "Load", "FooProvider1")},
+ {List.of("-cp", P2_CP, "Load", "FooProvider2")},
+ {List.of("-cp", P2DUP_CP, "Load", "FooProvider2")},
+ {List.of("-cp", P3P2_CP, "Load", "FooProvider3", "FooProvider2")},
+ {List.of("-cp", XTESTP2_CP, "Load", "FooProvider1", "FooProvider2")},
+ {List.of("-cp", P3XTEST_CP, "Load", "FooProvider3", "FooProvider1")},
+ {List.of("-cp", P3XTESTP2_CP, "Load", "FooProvider3",
+ "FooProvider1",
+ "FooProvider2")},
+ // Failures followed by successes
+ {List.of("-cp", XTESTXMETA_CP, "Load", "FooProvider1", "fail")},
+ {List.of("-cp", XMETAXTEST_CP, "Load", "fail", "FooProvider1")},
+ {List.of("-cp", XTESTXMETAP2_CP, "Load", "FooProvider1", "fail", "FooProvider2")}
+ };
+ }
+
+ @DataProvider
+ public Object[][] negativeTestCases() {
+ return new Object[][]{
+ {"blah blah"},
+ {"9234"},
+ {"X!"},
+ {"BarProvider"},
+ {"FooProvider42"}
+ };
+ }
+
+ @Test(dataProvider = "testCases")
+ public void testProvider(List<String> args) throws Throwable {
+ runJava(args);
+ }
+
+ @Test(dataProvider = "negativeTestCases")
+ public void testBadProvider(String providerName) throws Throwable {
+ Files.write(XMETA_CONFIG, providerName.getBytes());
+ runJava(List.of("-cp", XMETA_CP, "Load", "fail"));
+ }
+
+ private void runJava(List<String> opts) throws Throwable {
+ List<String> cmds = new ArrayList<>();
+ cmds.add(JDKToolFinder.getJDKTool("java"));
+ cmds.addAll(asList(Utils.getTestJavaOpts()));
+ cmds.addAll(opts);
+
+ ProcessTools.executeCommand(cmds.stream()
+ .filter(t -> !t.isEmpty())
+ .toArray(String[]::new))
+ .shouldHaveExitValue(0);
+ }
+
+ private void createProviderConfig(Path config, String providerName) throws Exception {
+ Files.createDirectories(config.getParent());
+ Files.write(config, providerName.getBytes(), CREATE);
+ }
+
+ private void createJar(Path jar, String provider, List<String> files) throws Exception {
+ Path xdir = Path.of(provider);
+ createProviderConfig(xdir.resolve(METAINFO), provider);
+
+ for (String f : files) {
+ Path source = Path.of(Utils.TEST_CLASSES, f + ".class");
+ Path target = xdir.resolve(source.getFileName());
+ Files.copy(source, target, REPLACE_EXISTING);
+ }
+ JarUtils.createJarFile(jar, xdir);
+ }
+
+}
--- a/test/jdk/java/util/ServiceLoader/basic/basic.sh Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4640520 6354623 7198496
-# @summary Unit test for java.util.ServiceLoader
-#
-# @build Basic Load FooService FooProvider1 FooProvider2 FooProvider3 BarProvider
-# @run shell basic.sh
-
-# Command-line usage: sh basic.sh /path/to/build
-
-if [ -z "$TESTJAVA" ]; then
- if [ $# -lt 1 ]; then exit 1; fi
- TESTJAVA="$1"; shift
- COMPILEJAVA="${TESTJAVA}"
- TESTSRC="`pwd`"
- TESTCLASSES="`pwd`"
-fi
-
-JAVA="$TESTJAVA/bin/java"
-JAR="$COMPILEJAVA/bin/jar"
-
-OS=`uname -s`
-case "$OS" in
- SunOS | Darwin | AIX )
- FS='/'
- SEP=':' ;;
- Linux )
- FS='/'
- SEP=':' ;;
- * )
- FS='\\'
- SEP='\;' ;;
-esac
-
-JARD=x.jar
-EXTD=x.ext
-TESTD=x.test
-P3JAR=${EXTD}${FS}p3.jar
-
-if [ \! -d $EXTD ]; then
- # Initialize
- echo Initializing...
- rm -rf $JARD $EXTD $TESTD
- mkdir -p $JARD $EXTD $TESTD
-
- for n in 2 3; do
- rm -rf $JARD/*; mkdir -p $JARD/META-INF/services
- echo FooProvider$n \
- >$JARD/META-INF/services/FooService
- cp $TESTCLASSES/FooProvider$n.class $JARD
- if [ $n = 3 ]; then
- cp $TESTCLASSES/FooService.class $JARD
- fi
- (cd $JARD; "$JAR" ${TESTTOOLVMOPTS} -cf ../p$n.jar *)
- done
-
- cp p2.jar p2dup.jar
- mv p3.jar $EXTD
-
- cp $TESTCLASSES/Load.class $TESTD
- cp $TESTCLASSES/FooService.class $TESTD
- cp $TESTCLASSES/FooProvider1.class $TESTD
- mkdir -p $TESTD/META-INF/services
- echo FooProvider1 \
- >$TESTD/META-INF/services/FooService
-
- # This gives us:
- # $TESTD: FooProvider1
- # . : FooProvider2, in p2.jar
- # $EXTD: FooProvider3, in p3.jar
-
-fi
-
-failures=0
-
-go() {
- echo ''
- cp="$1"; shift
- if [ -z "$cp" ]; then cp="$TESTCLASSES"; else cp="$TESTCLASSES$SEP$cp"; fi
- vmargs="$1"; shift
- sh -xc "'$JAVA' ${TESTVMOPTS} -cp $cp $vmargs $T $*" 2>&1
- if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-}
-
-
-# Java-level tests
-
-T=Basic
-go ".${SEP}$TESTD${SEP}p2.jar" ""
-
-# Success cases
-
-T=Load
-
-go "$TESTD" "" FooProvider1
-
-go ".${SEP}p2.jar" "" FooProvider2
-
-go ".${SEP}p2.jar${SEP}p2dup.jar" "" FooProvider2
-
-go "${P3JAR}${SEP}p2.jar" "" FooProvider3 FooProvider2
-
-go "$TESTD${SEP}p2.jar" "" FooProvider1 FooProvider2
-
-go "${P3JAR}${SEP}$TESTD" "" FooProvider3 FooProvider1
-
-go "${P3JAR}${SEP}$TESTD${SEP}p2.jar" "" \
- FooProvider3 FooProvider1 FooProvider2
-
-# Failure cases
-
-mkdir -p x.meta/META-INF/services
-
-# Simple failures
-for p in FooProvider42 'blah blah' 9234 'X!' BarProvider; do
- echo $p >x.meta/META-INF/services/FooService
- go ".${SEP}x.meta" "" fail
-done
-
-# Failures followed by successes
-echo FooProvider42 >x.meta/META-INF/services/FooService
-go "$TESTD${SEP}x.meta" "" FooProvider1 fail
-go "x.meta${SEP}$TESTD" "" fail FooProvider1
-go "$TESTD${SEP}x.meta${SEP}${SEP}p2.jar" "" \
- FooProvider1 fail FooProvider2
-
-
-# Summary
-
-echo ''
-if [ $failures -gt 0 ];
- then echo "$failures case(s) failed";
- else echo "All cases passed"; fi
-exit $failures
--- a/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -21,9 +21,9 @@
* questions.
*/
-/*
+ /*
* @test
- * @bug 8005471 8008577 8129881 8130845 8136518 8181157
+ * @bug 8005471 8008577 8129881 8130845 8136518 8181157 8210490
* @modules jdk.localedata
* @run main/othervm -Djava.locale.providers=CLDR CLDRDisplayNamesTest
* @summary Make sure that localized time zone names of CLDR are used
@@ -51,7 +51,7 @@
"\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593",
"GMT-07:00",
//"\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u6642\u9593",
- //"PT"
+ //"PT"
},
{
"zh-CN",
@@ -60,7 +60,7 @@
"\u5317\u7f8e\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6\u95f4",
"GMT-07:00",
//"\u5317\u7f8e\u592a\u5e73\u6d0b\u65f6\u95f4",
- //"PT",
+ //"PT",
},
{
"de-DE",
@@ -69,7 +69,7 @@
"Nordamerikanische Westk\u00fcsten-Sommerzeit",
"GMT-07:00",
//"Nordamerikanische Westk\u00fcstenzeit",
- //"PT",
+ //"PT",
},
};
@@ -86,7 +86,7 @@
String name = tz.getDisplayName(daylight, style, locale);
if (!data[i].equals(name)) {
System.err.printf("error: got '%s' expected '%s' (style=%d, daylight=%s, locale=%s)%n",
- name, data[i], style, daylight, locale);
+ name, data[i], style, daylight, locale);
errors++;
}
}
@@ -117,6 +117,17 @@
Locale.setDefault(originalLocale);
}
+ // for 8210490
+ // Check that TimeZone.getDisplayName should honor passed locale parameter,
+ // even if default locale is set to some other locale.
+ Locale.setDefault(Locale.forLanguageTag("ar-PK"));
+ TimeZone zi = TimeZone.getTimeZone("Etc/GMT-5");
+ String displayName = zi.getDisplayName(false, TimeZone.SHORT, Locale.US);
+ Locale.setDefault(originalLocale);
+ if (!displayName.equals("GMT+05:00")) {
+ System.err.printf("Wrong display name for timezone Etc/GMT-5 : expected GMT+05:00, Actual " + displayName);
+ errors++;
+ }
if (errors > 0) {
throw new RuntimeException("test failed");
}
--- a/test/jdk/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary Checks for responsiveness of blocking queues to cancellation.
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -56,7 +56,7 @@
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class CancelledProducerConsumerLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/BlockingQueue/Interrupt.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/BlockingQueue/Interrupt.java Mon Sep 17 09:36:33 2018 -0700
@@ -26,7 +26,7 @@
* @bug 6384064
* @summary Check proper handling of interrupts
* @author Martin Buchholz
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -41,7 +41,7 @@
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledThreadPoolExecutor;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class Interrupt {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary multiple producers and single consumer using blocking queues
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -52,7 +52,7 @@
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class MultipleProducersSingleConsumerLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary multiple producers and consumers using blocking queues
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -52,7 +52,7 @@
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ProducerConsumerLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary check ordering for blocking queues with 1 producer and multiple consumers
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -51,7 +51,7 @@
import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.SynchronousQueue;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class SingleProducerMultipleConsumerLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/CompletableFuture/Basic.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/CompletableFuture/Basic.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 8005696
* @summary Basic tests for CompletableFuture
- * @library /lib/testlibrary/
+ * @library /test/lib
* @run main Basic
* @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 Basic
* @author Chris Hegarty
@@ -56,7 +56,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class Basic {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -41,7 +41,7 @@
* inserts it, and if present, with probability premove it removes
* it. (pinsert and premove are expressed as percentages to simplify
* parsing from command line.)
- * @library /lib/testlibrary/
+ * @library /test/lib
* @run main/timeout=1600 MapLoops
*/
@@ -54,7 +54,7 @@
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class MapLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658 6785442
* @summary Checks that a set of threads can repeatedly get and modify items
- * @library /lib/testlibrary/
+ * @library /test/lib
* @run main ConcurrentQueueLoops 8 123456
*/
@@ -58,7 +58,7 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ConcurrentQueueLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/CyclicBarrier/Basic.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/CyclicBarrier/Basic.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6253848 6366811
* @summary Basic tests for CyclicBarrier
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Martin Buchholz, David Holmes
*/
@@ -39,7 +39,7 @@
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class Basic {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/Exchanger/ExchangeLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/Exchanger/ExchangeLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary checks to make sure a pipeline of exchangers passes data.
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -44,7 +44,7 @@
import java.util.concurrent.Exchanger;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ExchangeLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4965960
* @summary Exercise ExecutorCompletionService
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -44,7 +44,7 @@
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ExecutorCompletionServiceLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/Executors/AutoShutdown.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/Executors/AutoShutdown.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6399443
* @summary Check for auto-shutdown and gc of singleThreadExecutors
- * @library /lib/testlibrary/
+ * @library /test/lib
* @run main/othervm/timeout=1000 AutoShutdown
* @author Martin Buchholz
*/
@@ -41,7 +41,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class AutoShutdown {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/FutureTask/BlockingTaskExecutor.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/FutureTask/BlockingTaskExecutor.java Mon Sep 17 09:36:33 2018 -0700
@@ -26,7 +26,7 @@
* @bug 6431315
* @summary ExecutorService.invokeAll might hang
* @author Martin Buchholz
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -37,7 +37,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* Adapted from Doug Lea, which was...
--- a/test/jdk/java/util/concurrent/FutureTask/CancelledFutureLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/FutureTask/CancelledFutureLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -37,7 +37,7 @@
* @summary Checks for responsiveness of futures to cancellation.
* Runs under the assumption that ITERS computations require more than
* TIMEOUT msecs to complete.
- * @library /lib/testlibrary/
+ * @library /test/lib
* @run main/timeout=2000 CancelledFutureLoops
*/
@@ -52,7 +52,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.locks.ReentrantLock;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public final class CancelledFutureLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/FutureTask/DoneMeansDone.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/FutureTask/DoneMeansDone.java Mon Sep 17 09:36:33 2018 -0700
@@ -36,7 +36,7 @@
* @bug 8073704
* @summary Checks that once isDone() returns true,
* get() never throws InterruptedException or TimeoutException
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -52,7 +52,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class DoneMeansDone {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 6725789
* @summary Check for long overflow in task time comparison.
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.DAYS;
@@ -45,7 +45,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledThreadPoolExecutor;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class DelayOverflow {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java Mon Sep 17 09:36:33 2018 -0700
@@ -26,14 +26,14 @@
* @bug 7091003
* @summary ScheduledExecutorService never executes Runnable
* with corePoolSize of zero
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Chris Hegarty
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import java.util.concurrent.ScheduledThreadPoolExecutor;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* Verify that tasks can be run even with a core pool size of 0.
--- a/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 8022642 8065320 8129861
* @summary Ensure relative sanity when zero core threads
- * @library /lib/testlibrary/
+ * @library /test/lib
* @modules java.base/java.util.concurrent:open
*/
@@ -48,7 +48,7 @@
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.BooleanSupplier;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ZeroCoreThreads {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6233235 6268386
* @summary Test allowsCoreThreadTimeOut
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Martin Buchholz
*/
@@ -37,7 +37,7 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class CoreThreadTimeOut {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/Custom.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/Custom.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6277663
* @summary Test TPE extensibility framework
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Martin Buchholz
*/
@@ -41,7 +41,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BooleanSupplier;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class Custom {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
/*
* @test
* @summary Should be able to shutdown a pool when worker creation failed.
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -44,7 +44,7 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class FlakyThreadFactory {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6576792
* @summary non-idle worker threads should not be interrupted
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -34,7 +34,7 @@
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class SelfInterrupt {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java Mon Sep 17 09:36:33 2018 -0700
@@ -36,7 +36,7 @@
* @test
* @summary Only one thread should be created when a thread needs to
* be kept alive to service a delayed task waiting in the queue.
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -44,7 +44,7 @@
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class ThreadRestarts {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6458662
* @summary poolSize might shrink below corePoolSize after timeout
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Martin Buchholz
*/
@@ -34,7 +34,7 @@
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class TimeOutShrink {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/forkjoin/SubmissionTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/forkjoin/SubmissionTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,13 +23,13 @@
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.atomic.AtomicBoolean;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
* @bug 8078490
* @summary Test submission and execution of task without joining
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
public class SubmissionTest {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/Lock/CheckedLockLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/Lock/CheckedLockLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary basic safety and liveness of ReentrantLocks, and other locks based on them
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -48,7 +48,7 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public final class CheckedLockLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/Lock/TimedAcquireLeak.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/Lock/TimedAcquireLeak.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6460501 6236036 6500694 6490770
* @summary Repeated failed timed waits shouldn't leak memory
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Martin Buchholz
*/
@@ -56,7 +56,7 @@
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class TimedAcquireLeak {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary Checks for missed signals by locking and unlocking each of an array of locks once per thread
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -45,7 +45,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.locks.ReentrantLock;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public final class LockOncePerThreadLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658
* @summary multiple threads using a single lock
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -45,7 +45,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.ThreadLocalRandom;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public final class SimpleReentrantLockLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 4486658 5031862 8140471
* @summary Checks for responsiveness of locks to timeouts.
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -46,7 +46,7 @@
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public final class TimeoutLockLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 6207928 6328220 6378321 6625723
* @summary Recursive lock invariant sanity checks
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Martin Buchholz
*/
@@ -45,7 +45,7 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
// I am the Cownt, and I lahve to cownt.
public class Count {
--- a/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java Mon Sep 17 09:36:33 2018 -0700
@@ -41,7 +41,7 @@
* inserts it, and if present, with probability premove it removes
* it. (pinsert and premove are expressed as percentages to simplify
* parsing from command line.)
- * @library /lib/testlibrary/
+ * @library /test/lib
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -51,7 +51,7 @@
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class MapLoops {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/java/util/concurrent/locks/StampedLock/Basic.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/java/util/concurrent/locks/StampedLock/Basic.java Mon Sep 17 09:36:33 2018 -0700
@@ -35,7 +35,7 @@
* @test
* @bug 8005697
* @summary Basic tests for StampedLock
- * @library /lib/testlibrary/
+ * @library /test/lib
* @author Chris Hegarty
*/
@@ -50,7 +50,7 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.StampedLock;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class Basic {
static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
--- a/test/jdk/javax/management/monitor/GaugeMonitorDeadlockTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/monitor/GaugeMonitorDeadlockTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
* or notif delivered.
* @author Eamonn McManus
*
- * @library /lib/testlibrary
+ * @library /test/lib
*
* @run clean GaugeMonitorDeadlockTest
* @run build GaugeMonitorDeadlockTest
@@ -50,7 +50,7 @@
import javax.management.monitor.GaugeMonitor;
import javax.management.monitor.GaugeMonitorMBean;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class GaugeMonitorDeadlockTest {
private static enum When {IN_GET_ATTRIBUTE, IN_NOTIFY};
--- a/test/jdk/javax/management/monitor/StartStopTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/monitor/StartStopTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,9 +28,8 @@
* monitors are started and stopped in a loop.
* @author Luis-Miguel Alventosa
*
- * @library /lib/testlibrary
+ * @library /test/lib
*
- * @build jdk.testlibrary.*
* @run clean StartStopTest
* @run build StartStopTest
* @run main/othervm/timeout=300 StartStopTest 1
@@ -56,7 +55,7 @@
import javax.management.monitor.MonitorNotification;
import javax.management.monitor.StringMonitor;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class StartStopTest {
static int maxPoolSize;
--- a/test/jdk/javax/management/mxbean/MXBeanWeirdParamTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/mxbean/MXBeanWeirdParamTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,6 @@
* All the communication should be done via Open Types
* @author Olivier Lagneau
* @modules java.management.rmi
- * @library /lib/testlibrary
* @library /test/lib
* @compile Basic.java
* @run main/othervm/timeout=300 -DDEBUG_STANDARD MXBeanWeirdParamTest
@@ -121,7 +120,7 @@
private List<String> buildCommandLine() {
List<String> opts = new ArrayList<>();
opts.add(JDKToolFinder.getJDKTool("java"));
- opts.addAll(Arrays.asList(jdk.testlibrary.Utils.getTestJavaOpts()));
+ opts.addAll(Arrays.asList(jdk.test.lib.Utils.getTestJavaOpts()));
// We need to set WEIRD_PARAM propertty on the client-side
opts.add("-DWEIRD_PARAM");
opts.add("-cp");
--- a/test/jdk/javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,12 +24,11 @@
/*
* @test
* @bug 8159377
- * @library /lib/testlibrary
* @library /test/lib
* @summary Tests ObjectFilter on default agent
* @author Harsha Wardhana B
* @modules java.management
- * @build jdk.testlibrary.* DefaultAgentFilterTest
+ * @build DefaultAgentFilterTest
* @run main/othervm/timeout=600 -XX:+UsePerfData DefaultAgentFilterTest
*/
import java.io.EOFException;
@@ -56,7 +55,7 @@
import javax.management.remote.JMXServiceURL;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class DefaultAgentFilterTest {
--- a/test/jdk/javax/management/remote/mandatory/loading/MethodResultTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/remote/mandatory/loading/MethodResultTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,7 @@
* @summary Tests client default class loader used before JSR 160 loader
* @author Eamonn McManus
*
- * @library /lib/testlibrary
+ * @library /test/lib
*
* @run clean MethodResultTest
* @run build MethodResultTest
@@ -40,7 +40,7 @@
import java.util.*;
import javax.management.*;
import javax.management.remote.*;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
This test checks that the class loader that is used to deserialize
--- a/test/jdk/javax/management/security/AuthorizationTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/security/AuthorizationTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,6 @@
* @summary Checks various authentication behavior from remote jmx client
* @author Olivier Lagneau
* @modules java.management.rmi
- * @library /lib/testlibrary
* @library /test/lib
* @compile Simple.java
* @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=username1 -Dpassword=password1 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials
@@ -177,7 +176,7 @@
private List<String> buildCommandLine(String args[]) {
List<String> opts = new ArrayList<>();
opts.add(JDKToolFinder.getJDKTool("java"));
- opts.addAll(Arrays.asList(jdk.testlibrary.Utils.getTestJavaOpts()));
+ opts.addAll(Arrays.asList(jdk.test.lib.Utils.getTestJavaOpts()));
String usernameValue = System.getProperty(USERNAME_PROPERTY);
if (usernameValue != null) {
--- a/test/jdk/javax/management/security/SecurityTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/management/security/SecurityTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,6 @@
* @summary Checks various secure ways of connecting from remote jmx client
* @author Olivier Lagneau
* @modules java.management.rmi
- * @library /lib/testlibrary
* @library /test/lib
* @compile MBS_Light.java ServerDelegate.java TestSampleLoginModule.java
* @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=SQE_username -Dpassword=SQE_password SecurityTest -server -mapType x.password.file -client -mapType credentials
@@ -398,7 +397,7 @@
List<String> opts = new ArrayList<>();
opts.add(JDKToolFinder.getJDKTool("java"));
- opts.addAll(Arrays.asList(jdk.testlibrary.Utils.getTestJavaOpts()));
+ opts.addAll(Arrays.asList(jdk.test.lib.Utils.getTestJavaOpts()));
// We need to forward some properties to the client side
opts.add("-Dtest.src=" + System.getProperty("test.src"));
--- a/test/jdk/javax/xml/crypto/dsig/GenerationTests.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/javax/xml/crypto/dsig/GenerationTests.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
/**
* @test
* @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349 8046949
- * 8046724 8079693 8177334 8205507
+ * 8046724 8079693 8177334 8205507 8210736
* @summary Basic unit tests for generating XML Signatures with JSR 105
* @modules java.base/sun.security.util
* java.base/sun.security.x509
@@ -32,7 +32,7 @@
* jdk.httpserver/com.sun.net.httpserver
* @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
* X509KeySelector.java GenerationTests.java
- * @run main/othervm/timeout=300 GenerationTests
+ * @run main/othervm/timeout=300 -Dsun.net.httpserver.nodelay=true GenerationTests
* @author Sean Mullan
*/
@@ -51,7 +51,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import java.security.SecureRandom;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.security.cert.X509CRL;
--- a/test/jdk/lib/testlibrary/jdk/testlibrary/Utils.java Sat Sep 15 14:03:07 2018 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.testlibrary;
-
-import static jdk.testlibrary.Asserts.assertTrue;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BooleanSupplier;
-import java.util.function.Function;
-
-/**
- * Common library for various test helper functions.
- *
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/jdk/test/lib}
- */
-@Deprecated
-public final class Utils {
-
- /**
- * Returns the sequence used by operating system to separate lines.
- */
- public static final String NEW_LINE = System.getProperty("line.separator");
-
- /**
- * Returns the value of 'test.vm.opts'system property.
- */
- public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
-
- /**
- * Returns the value of 'test.java.opts'system property.
- */
- public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
-
- /**
- * Returns the value of 'test.timeout.factor' system property
- * converted to {@code double}.
- */
- public static final double TIMEOUT_FACTOR;
- static {
- String toFactor = System.getProperty("test.timeout.factor", "1.0");
- TIMEOUT_FACTOR = Double.parseDouble(toFactor);
- }
-
- /**
- * Returns the value of JTREG default test timeout in milliseconds
- * converted to {@code long}.
- */
- public static final long DEFAULT_TEST_TIMEOUT = TimeUnit.SECONDS.toMillis(120);
-
- private Utils() {
- // Private constructor to prevent class instantiation
- }
-
- /**
- * Returns the list of VM options.
- *
- * @return List of VM options
- */
- public static List<String> getVmOptions() {
- return Arrays.asList(safeSplitString(VM_OPTIONS));
- }
-
- /**
- * Returns the list of VM options with -J prefix.
- *
- * @return The list of VM options with -J prefix
- */
- public static List<String> getForwardVmOptions() {
- String[] opts = safeSplitString(VM_OPTIONS);
- for (int i = 0; i < opts.length; i++) {
- opts[i] = "-J" + opts[i];
- }
- return Arrays.asList(opts);
- }
-
- /**
- * Returns the default JTReg arguments for a jvm running a test.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
- * @return An array of options, or an empty array if no opptions.
- */
- public static String[] getTestJavaOpts() {
- List<String> opts = new ArrayList<String>();
- Collections.addAll(opts, safeSplitString(VM_OPTIONS));
- Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
- return opts.toArray(new String[0]);
- }
-
- /**
- * Combines given arguments with default JTReg arguments for a jvm running a test.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts
- * @return The combination of JTReg test java options and user args.
- */
- public static String[] addTestJavaOpts(String... userArgs) {
- List<String> opts = new ArrayList<String>();
- Collections.addAll(opts, getTestJavaOpts());
- Collections.addAll(opts, userArgs);
- return opts.toArray(new String[0]);
- }
-
- /**
- * Removes any options specifying which GC to use, for example "-XX:+UseG1GC".
- * Removes any options matching: -XX:(+/-)Use*GC
- * Used when a test need to set its own GC version. Then any
- * GC specified by the framework must first be removed.
- * @return A copy of given opts with all GC options removed.
- */
- private static final Pattern useGcPattern = Pattern.compile(
- "(?:\\-XX\\:[\\+\\-]Use.+GC)"
- + "|(?:\\-Xconcgc)");
- public static List<String> removeGcOpts(List<String> opts) {
- List<String> optsWithoutGC = new ArrayList<String>();
- for (String opt : opts) {
- if (useGcPattern.matcher(opt).matches()) {
- System.out.println("removeGcOpts: removed " + opt);
- } else {
- optsWithoutGC.add(opt);
- }
- }
- return optsWithoutGC;
- }
-
- /**
- * Splits a string by white space.
- * Works like String.split(), but returns an empty array
- * if the string is null or empty.
- */
- private static String[] safeSplitString(String s) {
- if (s == null || s.trim().isEmpty()) {
- return new String[] {};
- }
- return s.trim().split("\\s+");
- }
-
- /**
- * @return The full command line for the ProcessBuilder.
- */
- public static String getCommandLine(ProcessBuilder pb) {
- StringBuilder cmd = new StringBuilder();
- for (String s : pb.command()) {
- cmd.append(s).append(" ");
- }
- return cmd.toString();
- }
-
- /**
- * Returns the free port on the local host.
- *
- * @return The port number
- * @throws IOException if an I/O error occurs when opening the socket
- */
- public static int getFreePort() throws IOException {
- try (ServerSocket serverSocket =
- new ServerSocket(0, 5, InetAddress.getLoopbackAddress());) {
- return serverSocket.getLocalPort();
- }
- }
-
- /**
- * Returns the name of the local host.
- *
- * @return The host name
- * @throws UnknownHostException if IP address of a host could not be determined
- */
- public static String getHostname() throws UnknownHostException {
- InetAddress inetAddress = InetAddress.getLocalHost();
- String hostName = inetAddress.getHostName();
-
- assertTrue((hostName != null && !hostName.isEmpty()),
- "Cannot get hostname");
-
- return hostName;
- }
-
- /**
- * Adjusts the provided timeout value for the TIMEOUT_FACTOR
- * @param tOut the timeout value to be adjusted
- * @return The timeout value adjusted for the value of "test.timeout.factor"
- * system property
- */
- public static long adjustTimeout(long tOut) {
- return Math.round(tOut * Utils.TIMEOUT_FACTOR);
- }
-
- /**
- * Wait for condition to be true
- *
- * @param condition, a condition to wait for
- */
- public static final void waitForCondition(BooleanSupplier condition) {
- waitForCondition(condition, -1L, 100L);
- }
-
- /**
- * Wait until timeout for condition to be true
- *
- * @param condition, a condition to wait for
- * @param timeout a time in milliseconds to wait for condition to be true
- * specifying -1 will wait forever
- * @return condition value, to determine if wait was successfull
- */
- public static final boolean waitForCondition(BooleanSupplier condition,
- long timeout) {
- return waitForCondition(condition, timeout, 100L);
- }
-
- /**
- * Wait until timeout for condition to be true for specified time
- *
- * @param condition, a condition to wait for
- * @param timeout a time in milliseconds to wait for condition to be true,
- * specifying -1 will wait forever
- * @param sleepTime a time to sleep value in milliseconds
- * @return condition value, to determine if wait was successfull
- */
- public static final boolean waitForCondition(BooleanSupplier condition,
- long timeout, long sleepTime) {
- long startTime = System.currentTimeMillis();
- while (!(condition.getAsBoolean() || (timeout != -1L
- && ((System.currentTimeMillis() - startTime) > timeout)))) {
- try {
- Thread.sleep(sleepTime);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new Error(e);
- }
- }
- return condition.getAsBoolean();
- }
-
- /**
- * Interface same as java.lang.Runnable but with
- * method {@code run()} able to throw any Throwable.
- */
- public static interface ThrowingRunnable {
- void run() throws Throwable;
- }
-
- /**
- * Filters out an exception that may be thrown by the given
- * test according to the given filter.
- *
- * @param test - method that is invoked and checked for exception.
- * @param filter - function that checks if the thrown exception matches
- * criteria given in the filter's implementation.
- * @return - exception that matches the filter if it has been thrown or
- * {@code null} otherwise.
- * @throws Throwable - if test has thrown an exception that does not
- * match the filter.
- */
- public static Throwable filterException(ThrowingRunnable test,
- Function<Throwable, Boolean> filter) throws Throwable {
- try {
- test.run();
- } catch (Throwable t) {
- if (filter.apply(t)) {
- return t;
- } else {
- throw t;
- }
- }
- return null;
- }
-}
--- a/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -32,6 +32,7 @@
import java.util.Date;
import java.util.Locale;
import javax.swing.JFormattedTextField;
+import javax.swing.UIManager;
import static org.jemmy2ext.JemmyExt.*;
@@ -69,9 +70,9 @@
@Listeners(GuiTestListener.class)
public class TextFieldDemoTest {
- @Test
- public void test() throws Exception {
-
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(TextFieldDemo.class.getCanonicalName()).startApplication();
JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
@@ -144,11 +145,12 @@
});
// Check non-matching passwords
+ final Color backgroundColor = UIManager.getColor("TextField.background");
password2.typeText("passwereertegrs");
password1.waitState(new ComponentChooser() {
public boolean checkComponent(Component comp) {
- return password1.getBackground().equals(Color.white) &&
- password2.getBackground().equals(Color.white);
+ return password1.getBackground().equals(backgroundColor) &&
+ password2.getBackground().equals(backgroundColor);
}
public String getDescription() {
return "Passwords not to match";
--- a/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java Mon Sep 17 09:36:33 2018 -0700
@@ -27,7 +27,7 @@
import java.util.List;
import jdk.testlibrary.Asserts;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import jdk.test.lib.apps.LingeredApp;
import sun.jvmstat.monitor.MonitorException;
import sun.jvmstat.monitor.MonitoredHost;
--- a/test/jdk/sun/management/jdp/DynamicLauncher.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jdp/DynamicLauncher.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import java.util.UUID;
--- a/test/jdk/sun/management/jdp/PortAlreadyInUseTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jdp/PortAlreadyInUseTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
import jdk.test.lib.process.OutputAnalyzer;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import java.io.IOException;
import java.net.ServerSocket;
--- a/test/jdk/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -161,10 +161,10 @@
private int doTest() throws Exception {
for (int i = 0; i < MAX_GET_FREE_PORT_TRIES; ++i) {
- final String pp = "-Dcom.sun.management.jmxremote.port=" + jdk.testlibrary.Utils.getFreePort();
+ final String pp = "-Dcom.sun.management.jmxremote.port=" + jdk.test.lib.Utils.getFreePort();
List<String> command = new ArrayList<>();
- command.addAll(jdk.testlibrary.Utils.getVmOptions());
+ command.addAll(jdk.test.lib.Utils.getVmOptions());
command.add(mp);
command.add(pp);
command.add("-cp");
--- a/test/jdk/sun/management/jmxremote/bootstrap/LocalManagementTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/LocalManagementTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -28,7 +28,7 @@
import java.util.concurrent.atomic.AtomicReference;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* @test
@@ -38,13 +38,12 @@
* TestManager will attempt a connection to the address obtained from
* both agent properties and jvmstat buffer.
*
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
* jdk.attach
* jdk.management.agent/jdk.internal.agent
*
- * @build jdk.testlibrary.* TestManager TestApplication
+ * @build TestManager TestApplication
* @run main/othervm/timeout=300 LocalManagementTest
*/
public class LocalManagementTest {
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -635,7 +635,7 @@
for (int i = 0; i < MAX_GET_FREE_PORT_TRIES; i++) {
try {
- int port = jdk.testlibrary.Utils.getFreePort();
+ int port = jdk.test.lib.Utils.getFreePort();
final String path;
try {
path=(file==null)?null:file.getCanonicalPath();
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Mon Sep 17 09:36:33 2018 -0700
@@ -27,9 +27,9 @@
# @key intermittent
# @summary Test RMI Bootstrap
#
-# @library /lib/testlibrary
+# @library /test/lib
#
-# @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest
+# @build TestLogger Utils RmiBootstrapTest
# @run shell/timeout=300 RmiBootstrapTest.sh
# Define the Java class test name
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -43,10 +43,9 @@
* @summary Test that RMI registry uses SSL.
* @author Luis-Miguel Alventosa, Taras Ledkov
*
- * @library /lib/testlibrary
* @library /test/lib
*
- * @build jdk.testlibrary.* RmiRegistrySslTestApp
+ * @build RmiRegistrySslTestApp
* @run main/timeout=300 RmiRegistrySslTest
*/
public class RmiRegistrySslTest {
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTestApp.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTestApp.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import javax.rmi.ssl.SslRMIClientSocketFactory;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class RmiRegistrySslTestApp {
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh Mon Sep 17 09:36:33 2018 -0700
@@ -26,9 +26,9 @@
# @bug 6528083
# @summary Test RMI Bootstrap with SSL
#
-# @library /lib/testlibrary
+# @library /test/lib
#
-# @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest
+# @build TestLogger Utils RmiBootstrapTest
# @run shell/timeout=300 RmiSslBootstrapTest.sh
# Define the Java class test name
--- a/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -45,7 +45,7 @@
import javax.net.ssl.SSLHandshakeException;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import jdk.internal.agent.Agent;
import jdk.internal.agent.AgentConfigurationError;
import jdk.internal.agent.ConnectorAddressLink;
@@ -57,13 +57,12 @@
* @summary Makes sure that enabling/disabling the management agent through JCMD
* achieves the desired results
*
- * @library /lib/testlibrary
* @library /test/lib
* @modules java.management
* java.rmi
* jdk.management.agent/jdk.internal.agent
*
- * @build jdk.testlibrary.* JMXStartStopTest PortAllocator TestApp ManagementAgentJcmd
+ * @build JMXStartStopTest PortAllocator TestApp ManagementAgentJcmd
* @run main/othervm/timeout=600 -XX:+UsePerfData JMXStartStopTest
*/
public class JMXStartStopTest {
--- a/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8164879
- * @library /lib/testlibrary ../../
+ * @library ../../
* @library /test/lib
* @summary Verify AES/GCM's limits set in the jdk.tls.keyLimits property
* start a new handshake sequence to renegotiate the symmetric key with an
@@ -56,7 +56,7 @@
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class SSLEngineKeyLimit {
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java Mon Sep 17 09:36:33 2018 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8164879
- * @library /lib/testlibrary ../../
+ * @library ../../
* @library /test/lib
* @modules java.base/sun.security.util
* @summary Verify AES/GCM's limits set in the jdk.tls.keyLimits property
@@ -58,7 +58,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import sun.security.util.HexDumpEncoder;
public class SSLSocketKeyLimit {
--- a/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java Mon Sep 17 09:36:33 2018 -0700
@@ -30,7 +30,7 @@
import java.util.List;
import jdk.test.lib.process.OutputAnalyzer;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
--- a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java Mon Sep 17 09:36:33 2018 -0700
@@ -32,7 +32,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/*
* @test
--- a/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -25,9 +25,7 @@
* @test
* @summary Basic test for jhsdb launcher
* @library /test/lib
- * @library /lib/testlibrary
* @requires vm.hasSAandCanAttach
- * @build jdk.testlibrary.*
* @build jdk.test.lib.apps.*
* @run main BasicLauncherTest
*/
@@ -45,7 +43,7 @@
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.Platform;
import jdk.test.lib.JDKToolLauncher;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class BasicLauncherTest {
--- a/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -29,7 +29,7 @@
import java.util.Map;
import jdk.test.lib.apps.LingeredApp;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import jdk.test.lib.Platform;
/**
@@ -39,7 +39,6 @@
*
* @requires vm.hasSAandCanAttach
* @library /test/lib
- * @library /lib/testlibrary
* @modules java.management
* jdk.hotspot.agent/sun.jvm.hotspot
*
--- a/test/jdk/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java Mon Sep 17 09:36:33 2018 -0700
@@ -34,7 +34,7 @@
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.JDKToolLauncher;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
public class TmtoolTestScenario {
--- a/test/jdk/sun/tools/jps/JpsHelper.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jps/JpsHelper.java Mon Sep 17 09:36:33 2018 -0700
@@ -39,7 +39,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jdk.testlibrary.Asserts;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
/**
* The helper class for running jps utility and verifying output from it
--- a/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -31,7 +31,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import jdk.test.lib.JDKToolLauncher;
/**
@@ -39,8 +39,6 @@
* @summary Test deadlock detection
* @requires vm.hasSAandCanAttach
* @library /test/lib
- * @library /lib/testlibrary
- * @build jdk.testlibrary.*
* @build jdk.test.lib.apps.* jdk.test.lib.Platform
* @build DeadlockDetectionTest
* @run main DeadlockDetectionTest
--- a/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
import java.util.Arrays;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import static jdk.testlibrary.Asserts.*;
import java.text.NumberFormat;
--- a/test/jdk/sun/tools/jstatd/JstatdTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jdk/sun/tools/jstatd/JstatdTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -30,7 +30,7 @@
import jdk.test.lib.thread.ProcessThread;
import static jdk.testlibrary.Asserts.*;
-import jdk.testlibrary.Utils;
+import jdk.test.lib.Utils;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
--- a/test/jtreg-ext/requires/VMProps.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/jtreg-ext/requires/VMProps.java Mon Sep 17 09:36:33 2018 -0700
@@ -84,7 +84,7 @@
map.put("vm.hasJFR", vmHasJFR());
map.put("vm.cpu.features", cpuFeatures());
map.put("vm.rtm.cpu", vmRTMCPU());
- map.put("vm.rtm.os", vmRTMOS());
+ map.put("vm.rtm.compiler", vmRTMCompiler());
map.put("vm.aot", vmAOT());
// vm.cds is true if the VM is compiled with cds support.
map.put("vm.cds", vmCDS());
@@ -131,8 +131,6 @@
}
}
-
-
/**
* @return VM type value extracted from the "java.vm.name" property.
*/
@@ -301,24 +299,16 @@
}
/**
- * @return true if VM runs RTM supported OS and false otherwise.
+ * @return true if compiler in use supports RTM and false otherwise.
*/
- protected String vmRTMOS() {
- boolean isRTMOS = true;
+ protected String vmRTMCompiler() {
+ boolean isRTMCompiler = false;
- if (Platform.isAix()) {
- // Actually, this works since AIX 7.1.3.30, but os.version property
- // is set to 7.1.
- isRTMOS = (Platform.getOsVersionMajor() > 7) ||
- (Platform.getOsVersionMajor() == 7 && Platform.getOsVersionMinor() > 1);
-
- } else if (Platform.isLinux()) {
- if (Platform.isPPC()) {
- isRTMOS = (Platform.getOsVersionMajor() > 4) ||
- (Platform.getOsVersionMajor() == 4 && Platform.getOsVersionMinor() > 1);
- }
+ if (Compiler.isC2Enabled() &&
+ (Platform.isX86() || Platform.isX64() || Platform.isPPC())) {
+ isRTMCompiler = true;
}
- return "" + isRTMOS;
+ return "" + isRTMCompiler;
}
/**
--- a/test/langtools/jdk/jshell/ToolLocalSimpleTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/langtools/jdk/jshell/ToolLocalSimpleTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -85,4 +85,9 @@
);
}
+ @Test
+ public void testRawString() {
+ // can't set --enable-preview for local, ignore
+ }
+
}
--- a/test/langtools/jdk/jshell/ToolSimpleTest.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/langtools/jdk/jshell/ToolSimpleTest.java Mon Sep 17 09:36:33 2018 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024 8160089 8153897 8167128 8154513 8170015 8170368 8172102 8172103 8165405 8173073 8173848 8174041 8173916 8174028 8174262 8174797 8177079 8180508 8177466 8172154 8192979 8191842 8198573 8198801
+ * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024 8160089 8153897 8167128 8154513 8170015 8170368 8172102 8172103 8165405 8173073 8173848 8174041 8173916 8174028 8174262 8174797 8177079 8180508 8177466 8172154 8192979 8191842 8198573 8198801 8210596
* @summary Simple jshell tool tests
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
@@ -75,6 +75,22 @@
}
@Test
+ public void testRawString() {
+ test(false, new String[]{"--enable-preview", "--no-startup"},
+ (a) -> assertCommand(a, "String s = `abc`", "s ==> \"abc\""),
+ (a) -> assertCommand(a, "String a = `abc", ""),
+ (a) -> assertCommand(a, "def`", "a ==> \"abc\\ndef\""),
+ (a) -> assertCommand(a, "String bj = ``Hi, `Bob` and ```Jim```.``", "bj ==> \"Hi, `Bob` and ```Jim```.\""),
+ (a) -> assertCommand(a, "String hw = ````````````", ""),
+ (a) -> assertCommand(a, "Hello, world", ""),
+ (a) -> assertCommand(a, "````````````;", "hw ==> \"\\nHello, world\\n\""),
+ (a) -> assertCommand(a, "String uc = `\\u000d\\u000a`", "uc ==> \"\\\\u000d\\\\u000a\""),
+ (a) -> assertCommand(a, "String es = `\\(.\\)\\1`", "es ==> \"\\\\(.\\\\)\\\\1\""),
+ (a) -> assertCommand(a, "String end = `abc`+`def`+`ghi`", "end ==> \"abcdefghi\"")
+ );
+ }
+
+ @Test
public void testLessThan() {
test(
(a) -> assertCommand(a, "45", "$1 ==> 45"),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/cycle/T8193561.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,21 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8193561
+ * @summary Verify that there is no crash for default methods in mutually dependent interfaces
+ * @compile/fail/ref=T8193561.out -XDrawDiagnostics T8193561.java
+ */
+package p;
+
+interface T8193561 extends p.T8193561.I {
+
+ interface I extends T8193561 {
+ default boolean m() {
+ return false;
+ }
+ }
+
+ default boolean m() {
+ return false;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/cycle/T8193561.out Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,2 @@
+T8193561.java:9:1: compiler.err.cyclic.inheritance: p.T8193561
+1 error
--- a/test/langtools/tools/javac/desugar/BoxingAndSuper.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/langtools/tools/javac/desugar/BoxingAndSuper.java Mon Sep 17 09:36:33 2018 -0700
@@ -100,7 +100,7 @@
"p.Test.dump()java.lang.Integer\n" +
"{\n" +
" return (let /*synthetic*/ final Integer $le0 = (Integer)super.i " +
- "in (let /*synthetic*/ final Integer $le1 = super.i = Integer.valueOf((int)(super.i.intValue() + 1)) " +
+ "in (let super.i = Integer.valueOf((int)(super.i.intValue() + 1)); " +
"in $le0));\n" +
"}\n");
//qualified super, same package:
@@ -121,7 +121,7 @@
"p.Test.Inner.dump()java.lang.Integer\n" +
"{\n" +
" return (let /*synthetic*/ final Integer $le0 = (Integer)Test.access$001(this$0) " +
- "in (let /*synthetic*/ final Integer $le1 = Test.access$103(this$0, Integer.valueOf((int)(Test.access$201(this$0).intValue() + 1))) " +
+ "in (let Test.access$103(this$0, Integer.valueOf((int)(Test.access$201(this$0).intValue() + 1))); " +
"in $le0));\n" +
"}\n" +
"p.Test.access$001(p.Test)java.lang.Integer\n" +
@@ -152,7 +152,7 @@
"p1.Test.dump()java.lang.Integer\n" +
"{\n" +
" return (let /*synthetic*/ final Integer $le0 = (Integer)super.i " +
- "in (let /*synthetic*/ final Integer $le1 = super.i = Integer.valueOf((int)(super.i.intValue() + 1)) " +
+ "in (let super.i = Integer.valueOf((int)(super.i.intValue() + 1)); " +
"in $le0));\n" +
"}\n");
//qualified super, different packages:
@@ -173,7 +173,7 @@
"p1.Test.Inner.dump()java.lang.Integer\n" +
"{\n" +
" return (let /*synthetic*/ final Integer $le0 = (Integer)Test.access$001(this$0) " +
- "in (let /*synthetic*/ final Integer $le1 = Test.access$103(this$0, Integer.valueOf((int)(Test.access$201(this$0).intValue() + 1))) " +
+ "in (let Test.access$103(this$0, Integer.valueOf((int)(Test.access$201(this$0).intValue() + 1))); " +
"in $le0));\n" +
"}\n" +
"p1.Test.access$001(p1.Test)java.lang.Integer\n" +
@@ -201,8 +201,8 @@
String expected =
"Test.dump()void\n" +
"{\n" +
- " (let /*synthetic*/ final Integer $le0 = i in (let /*synthetic*/ final Integer $le1 = i = Integer.valueOf((int)(i.intValue() + 1)) in $le0));\n" +
- " (let /*synthetic*/ final Integer $le2 = (Integer)this.i in (let /*synthetic*/ final Integer $le3 = this.i = Integer.valueOf((int)(this.i.intValue() + 1)) in $le2));\n" +
+ " (let /*synthetic*/ final Integer $le0 = i in (let i = Integer.valueOf((int)(i.intValue() + 1)); in $le0));\n" +
+ " (let /*synthetic*/ final Integer $le1 = (Integer)this.i in (let this.i = Integer.valueOf((int)(this.i.intValue() + 1)); in $le1));\n" +
"}\n";
runTest(code, expected);
//qualified this:
@@ -219,8 +219,8 @@
"Test.Inner1.Inner2.dump()java.lang.Integer\n" +
"{\n" +
" return (let /*synthetic*/ final Integer $le0 = (Integer)this$1.this$0.i" +
- " in (let /*synthetic*/ final Integer $le1 = this$1.this$0.i = " +
- "Integer.valueOf((int)(this$1.this$0.i.intValue() + 1)) " +
+ " in (let this$1.this$0.i = " +
+ "Integer.valueOf((int)(this$1.this$0.i.intValue() + 1)); " +
"in $le0));\n" +
"}\n"
);
@@ -329,7 +329,8 @@
LetExpr le = (LetExpr) tree;
for (JCStatement var : le.defs) {
- letExprRemap.put(((JCVariableDecl) var).name.toString(), "$le" + i++);
+ if (var.hasTag(Tag.VARDEF))
+ letExprRemap.put(((JCVariableDecl) var).name.toString(), "$le" + i++);
}
}
return super.visitOther(node, p);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/PackageInfo/ClassAnnotations/ClassAnnotations.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * @test
+ * @bug 8193037
+ * @summary ensure annotations on package-infos loaded from the classpath are reported on all
+ * processing rounds
+ * @library /tools/javac/lib
+ * @modules java.compiler jdk.compiler
+ * @build Processor
+ * @compile package-info.java
+ * @compile -processor Processor ClassAnnotations.java
+ */
+package p;
+
+public class ClassAnnotations {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/PackageInfo/ClassAnnotations/Processor.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+
+@SupportedAnnotationTypes("*")
+public class Processor extends JavacTestingAbstractProcessor {
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ PackageElement p = processingEnv.getElementUtils().getPackageElement("p");
+ // Ensure that the annotations on the package-info for p are present during all annotation
+ // processing rounds.
+ if (p.getAnnotationMirrors().isEmpty()) {
+ throw new AssertionError("expected package annotations");
+ }
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/PackageInfo/ClassAnnotations/package-info.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+@Deprecated
+package p;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/PackageInfo/Overwrite/Overwrite.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * @test
+ * @bug 8193037
+ * @summary ensure package-infos are reset between annotation processing rounds
+ * @library /tools/javac/lib
+ * @modules java.compiler jdk.compiler
+ * @build Processor
+ * @compile package-info.java
+ * @compile -processor Processor Overwrite.java
+ */
+package p;
+
+public class Overwrite {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/PackageInfo/Overwrite/Processor.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.IOError;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+
+@SupportedAnnotationTypes("*")
+public class Processor extends JavacTestingAbstractProcessor {
+
+ boolean first = true;
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ if (first) {
+ // Annotations are present on the initial package-info loaded from the classpath.
+ PackageElement p = processingEnv.getElementUtils().getPackageElement("p");
+ if (p.getAnnotationMirrors().isEmpty()) {
+ throw new AssertionError(
+ "expected package annotations: " + p.getAnnotationMirrors());
+ }
+ // Overwrite the package-info with a new unannotated package-info.
+ try (OutputStream os =
+ processingEnv
+ .getFiler()
+ .createSourceFile("p.package-info")
+ .openOutputStream()) {
+ os.write("package p;".getBytes(UTF_8));
+ } catch (IOException e) {
+ throw new IOError(e);
+ }
+ first = false;
+ }
+ // The package-info's symbol should be reset between rounds, and when annotation
+ // processing is over the package-info should be unannotated.
+ PackageElement p = processingEnv.getElementUtils().getPackageElement("p");
+ if (roundEnv.processingOver()) {
+ if (!p.getAnnotationMirrors().isEmpty()) {
+ throw new AssertionError(
+ "expected no package annotations: " + p.getAnnotationMirrors());
+ }
+ }
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/PackageInfo/Overwrite/package-info.java Mon Sep 17 09:36:33 2018 -0700
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2018, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+@Deprecated
+package p;
--- a/test/lib/sun/hotspot/WhiteBox.java Sat Sep 15 14:03:07 2018 -0700
+++ b/test/lib/sun/hotspot/WhiteBox.java Mon Sep 17 09:36:33 2018 -0700
@@ -103,6 +103,7 @@
return isClassAlive0(name.replace('.', '/'));
}
private native boolean isClassAlive0(String name);
+ public native int getSymbolRefcount(String name);
private native boolean isMonitorInflated0(Object obj);
public boolean isMonitorInflated(Object obj) {